diff --git a/composer.json b/composer.json
index c93596aa..e6613277 100644
--- a/composer.json
+++ b/composer.json
@@ -20,7 +20,8 @@
 		"doctrine/orm": "~2.4",
 		"kdyby/events": "~1.0",
 		"kdyby/console": "~1.0",
-		"kdyby/annotations": "~1.0"
+		"kdyby/annotations": "~1.0",
+		"kdyby/doctrine-cache": "~1.1"
 	},
 	"require-dev": {
 		"nette/tester": "@dev",
diff --git a/src/Kdyby/Doctrine/DI/OrmExtension.php b/src/Kdyby/Doctrine/DI/OrmExtension.php
index 429aba47..eee2897f 100644
--- a/src/Kdyby/Doctrine/DI/OrmExtension.php
+++ b/src/Kdyby/Doctrine/DI/OrmExtension.php
@@ -114,7 +114,7 @@ class OrmExtension extends Nette\DI\CompilerExtension
 		'default' => 'Kdyby\DoctrineCache\Cache',
 		'apc' => 'Doctrine\Common\Cache\ApcCache',
 		'array' => 'Doctrine\Common\Cache\ArrayCache',
-		'memcache' => 'Doctrine\Common\Cache\MemcacheCache',
+		'memcache' => 'Kdyby\DoctrineCache\MemcacheCache',
 		'redis' => 'Doctrine\Common\Cache\RedisCache',
 		'xcache' => 'Doctrine\Common\Cache\XcacheCache',
 	);
@@ -443,7 +443,7 @@ protected function processMetadataDriver(Nette\DI\ServiceDefinition $metadataDri
 		$serviceName = $this->prefix($prefix . '.driver.' . str_replace('\\', '_', $namespace) . '.' . $impl . 'Impl');
 
 		$this->getContainerBuilder()->addDefinition($serviceName)
-			->setClass($driver->entity)
+			->setClass('Doctrine\Common\Persistence\Mapping\Driver\MappingDriver')
 			->setFactory($driver->entity, $driver->arguments)
 			->setAutowired(FALSE);
 
@@ -475,7 +475,7 @@ protected function processCache($cache, $suffix)
 		}
 
 		$def = $builder->addDefinition($serviceName = $this->prefix('cache.' . $suffix))
-			->setClass($cache->entity)
+			->setClass('Doctrine\Common\Cache\Cache')
 			->setFactory($cache->entity, $cache->arguments)
 			->setAutowired(FALSE);