diff --git a/lib/private/memcache/nullcache.php b/lib/private/memcache/null.php
similarity index 96%
rename from lib/private/memcache/nullcache.php
rename to lib/private/memcache/null.php
index 77eadba4eba2b19389e32ee19f4a7dc1ce0d9a1e..982f7edc80fe3badf3c53f321ce7c7335929eb97 100644
--- a/lib/private/memcache/nullcache.php
+++ b/lib/private/memcache/null.php
@@ -22,7 +22,7 @@
 
 namespace OC\Memcache;
 
-class NullCache extends Cache implements \OCP\IMemcache {
+class Null extends Cache implements \OCP\IMemcache {
 	public function get($key) {
 		return null;
 	}
diff --git a/lib/private/server.php b/lib/private/server.php
index 6e4f1517c12684f6f2003a0e7441ac6d3294718e..8113080977fbce7f5ab9faf116a8b8b867b54018 100644
--- a/lib/private/server.php
+++ b/lib/private/server.php
@@ -46,6 +46,7 @@ use OC\Lock\MemcacheLockingProvider;
 use OC\Lock\NoopLockingProvider;
 use OC\Mail\Mailer;
 use OC\Memcache\ArrayCache;
+use OC\Memcache\Null as NullCache;
 use OC\Http\Client\ClientService;
 use OC\Security\CertificateManager;
 use OC\Files\Node\Root;
@@ -56,6 +57,7 @@ use OC\Security\SecureRandom;
 use OC\Diagnostics\NullEventLogger;
 use OC\Security\TrustedDomainHelper;
 use OCP\IServerContainer;
+use OCP\ISession;
 use OC\Tagging\TagMapper;
 
 /**
@@ -427,7 +429,7 @@ class Server extends SimpleContainer implements IServerContainer {
 				/** @var \OC\Memcache\Factory $memcacheFactory */
 				$memcacheFactory = $c->getMemCacheFactory();
 				$memcache = $memcacheFactory->createLocking('lock');
-				if (!($memcache instanceof \OC\Memcache\NullCache)) {
+				if (!($memcache instanceof \OC\Memcache\Null)) {
 					return new MemcacheLockingProvider($memcache);
 				}
 			}