Jak vytvořit objekt Nette\Database\Context

Dle dokumentace na https://doc.nette.org/cs/database se Context vytváří jako:

<?php
$connection = new Connection($dsn, $user, $password, [
    'lazy' => FALSE,
    'driverClass' => 'App\JmenoVasiVlastniImplementaceOvladace'
]);

$database = new Context($connection);
?>

V aktuální verzi ale Context vyžaduje 2 povinné argumenty:

<?php
public function __construct(Connection $connection, IStructure $structure, IConventions $conventions = NULL, Nette\Caching\IStorage $cacheStorage = NULL)
	{
		$this->connection = $connection;
		$this->structure = $structure;
		$this->conventions = $conventions ?: new StaticConventions;
		$this->cacheStorage = $cacheStorage;
	}
?>

Lze to vyřešit jako:

<?php
    /**
     * @inject
     * @var Nette\Caching\IStorage
     */
    public $cache;

...
	function db(){
		$connection = new Connection($dsn, $user, $password, [
    		'lazy' => FALSE,
		    'driverClass' => 'App\JmenoVasiVlastniImplementaceOvladace'
		]);

        $structure = new Nette\Database\Structure($connection, $this->cache);
        $context = new Nette\Database\Context($connection, $structure);
        return $context;
    }
?>