diff --git a/lib/private/memcache/factory.php b/lib/private/memcache/factory.php
index 48c97b5955..334cf9a1f0 100644
--- a/lib/private/memcache/factory.php
+++ b/lib/private/memcache/factory.php
@@ -8,7 +8,9 @@
 
 namespace OC\Memcache;
 
-class Factory {
+use \OCP\ICacheFactory;
+
+class Factory implements ICacheFactory {
 	/**
 	 * @var string $globalPrefix
 	 */
diff --git a/lib/public/cachefactory.php b/lib/public/icachefactory.php
similarity index 64%
rename from lib/public/cachefactory.php
rename to lib/public/icachefactory.php
index 1bb0ea3dd5..874f1ec0a5 100644
--- a/lib/public/cachefactory.php
+++ b/lib/public/icachefactory.php
@@ -8,17 +8,19 @@
 
 namespace OCP;
 
-interface CacheFactory{
+interface ICacheFactory{
 	/**
 	 * Get a memory cache instance
 	 *
+	 * All entries added trough the cache instance will be namespaced by $prefix to prevent collisions between apps
+	 *
 	 * @param string $prefix
-	 * @return $return \OCP\ICache
+	 * @return \OCP\ICache
 	 */
 	public function create($prefix = '');
 
 	/**
-	 * Check if a memory cache backend is available
+	 * Check if any memory cache backend is available
 	 *
 	 * @return bool
 	 */
diff --git a/lib/public/iservercontainer.php b/lib/public/iservercontainer.php
index 67884bdc3e..5473f3ee33 100644
--- a/lib/public/iservercontainer.php
+++ b/lib/public/iservercontainer.php
@@ -144,7 +144,7 @@ interface IServerContainer {
 	/**
 	 * Returns an \OCP\CacheFactory instance
 	 *
-	 * @return \OCP\CacheFactory
+	 * @return \OCP\ICacheFactory
 	 */
 	function getMemCacheFactory();