diff --git a/lib/base.php b/lib/base.php
index a9d582dcc3..c0ee3e84e1 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -652,7 +652,6 @@ class OC {
 			OC_User::setupBackends();
 		}
 
-		self::registerCacheHooks();
 		self::registerFilesystemHooks();
 		if (\OC::$server->getSystemConfig()->getValue('enable_previews', false)) {
 			self::registerPreviewHooks();
@@ -730,19 +729,6 @@ class OC {
 		}
 	}
 
-	/**
-	 * register hooks for the cache
-	 */
-	public static function registerCacheHooks() {
-		if (\OC::$server->getSystemConfig()->getValue('installed', false) && !\OCP\Util::needUpgrade()) { //don't try to do this before we are properly setup
-			\OCP\BackgroundJob::registerJob('OC\Cache\FileGlobalGC');
-
-			// NOTE: This will be replaced to use OCP
-			$userSession = \OC_User::getUserSession();
-			$userSession->listen('postLogin', '\OC\Cache\File', 'loginListener');
-		}
-	}
-
 	/**
 	 * register hooks for the cache
 	 */
diff --git a/lib/private/backgroundjob/joblist.php b/lib/private/backgroundjob/joblist.php
index c568873bb4..e8915b47f2 100644
--- a/lib/private/backgroundjob/joblist.php
+++ b/lib/private/backgroundjob/joblist.php
@@ -172,9 +172,6 @@ class JobList implements IJobList {
 		/**
 		 * @var Job $job
 		 */
-		if ($class === 'OC_Cache_FileGlobalGC') {
-			$class = '\OC\Cache\FileGlobalGC';
-		}
 		if (!class_exists($class)) {
 			// job from disabled app or old version of an app, no need to do anything
 			return null;