diff --git a/typo3/sysext/core/Configuration/DefaultConfiguration.php b/typo3/sysext/core/Configuration/DefaultConfiguration.php
index 11973abe8f2af174419db7292361f86239687e1b..0ddf96f34a7b02a2ba07b715193161f6e77e56b8 100644
--- a/typo3/sysext/core/Configuration/DefaultConfiguration.php
+++ b/typo3/sysext/core/Configuration/DefaultConfiguration.php
@@ -191,6 +191,11 @@ return array(
 					),
 					'groups' => array('system')
 				),
+				'fluid_template' => array(
+					'backend' => \TYPO3\CMS\Core\Cache\Backend\FileBackend::class,
+					'frontend' => \TYPO3\CMS\Core\Cache\Frontend\PhpFrontend::class,
+					'groups' => array('system'),
+				),
 				'extbase_object' => array(
 					'frontend' => \TYPO3\CMS\Core\Cache\Frontend\VariableFrontend::class,
 					'backend' => \TYPO3\CMS\Core\Cache\Backend\Typo3DatabaseBackend::class,
@@ -207,6 +212,21 @@ return array(
 					),
 					'groups' => array('system')
 				),
+				'extbase_typo3dbbackend_tablecolumns' => array(
+					'frontend' => \TYPO3\CMS\Core\Cache\Frontend\VariableFrontend::class,
+					'backend' => \TYPO3\CMS\Core\Cache\Backend\Typo3DatabaseBackend::class,
+					'groups' => array('system'),
+				),
+				'extbase_typo3dbbackend_queries' => array(
+					'frontend' => \TYPO3\CMS\Core\Cache\Frontend\VariableFrontend::class,
+					'backend' => \TYPO3\CMS\Core\Cache\Backend\Typo3DatabaseBackend::class,
+					'groups' => array('system'),
+				),
+				'extbase_datamapfactory_datamap' => array(
+					'frontend' => \TYPO3\CMS\Core\Cache\Frontend\VariableFrontend::class,
+					'backend' => \TYPO3\CMS\Core\Cache\Backend\Typo3DatabaseBackend::class,
+					'groups' => array('system'),
+				),
 			),
 		),
 		'defaultCategorizedTables' => 'pages,tt_content,sys_file_metadata', // List of comma separated tables that are categorizable by default.
diff --git a/typo3/sysext/extbase/ext_localconf.php b/typo3/sysext/extbase/ext_localconf.php
index fc11f33e18a6f4922f9db897ee9f3ad06e7b0d34..946a78c92f44eacceb50dc668b33806e8907826a 100644
--- a/typo3/sysext/extbase/ext_localconf.php
+++ b/typo3/sysext/extbase/ext_localconf.php
@@ -1,22 +1,6 @@
 <?php
 defined('TYPO3_MODE') or die();
 
-if (!is_array($GLOBALS['TYPO3_CONF_VARS']['SYS']['caching']['cacheConfigurations']['extbase_typo3dbbackend_tablecolumns'])) {
-	$GLOBALS['TYPO3_CONF_VARS']['SYS']['caching']['cacheConfigurations']['extbase_typo3dbbackend_tablecolumns'] = array(
-		'groups' => array('system')
-	);
-}
-if (!is_array($GLOBALS['TYPO3_CONF_VARS']['SYS']['caching']['cacheConfigurations']['extbase_typo3dbbackend_queries'])) {
-	$GLOBALS['TYPO3_CONF_VARS']['SYS']['caching']['cacheConfigurations']['extbase_typo3dbbackend_queries'] = array(
-		'groups' => array('system')
-	);
-}
-if (!is_array($GLOBALS['TYPO3_CONF_VARS']['SYS']['caching']['cacheConfigurations']['extbase_datamapfactory_datamap'])) {
-	$GLOBALS['TYPO3_CONF_VARS']['SYS']['caching']['cacheConfigurations']['extbase_datamapfactory_datamap'] = array(
-		'groups' => array('system')
-	);
-}
-
 // We set the default implementation for Storage Backend & Query Settings in Backend and Frontend.
 // The code below is NO PUBLIC API!
 /** @var $extbaseObjectContainer \TYPO3\CMS\Extbase\Object\Container\Container */
diff --git a/typo3/sysext/fluid/ext_localconf.php b/typo3/sysext/fluid/ext_localconf.php
deleted file mode 100644
index 0ade0ae51abb84a42c07d6ae2a0576bf0a8af542..0000000000000000000000000000000000000000
--- a/typo3/sysext/fluid/ext_localconf.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-defined('TYPO3_MODE') or die();
-
-// Register caches if not already done in localconf.php or a previously loaded extension.
-if (!is_array($GLOBALS['TYPO3_CONF_VARS']['SYS']['caching']['cacheConfigurations']['fluid_template'])) {
-	$GLOBALS['TYPO3_CONF_VARS']['SYS']['caching']['cacheConfigurations']['fluid_template'] = array(
-		'backend' => \TYPO3\CMS\Core\Cache\Backend\FileBackend::class,
-		'frontend' => \TYPO3\CMS\Core\Cache\Frontend\PhpFrontend::class,
-		'groups' => array('system')
-	);
-}
diff --git a/typo3/sysext/install/Classes/Controller/AbstractController.php b/typo3/sysext/install/Classes/Controller/AbstractController.php
index b83ee60a48c5f5866b8783c135b3aad768f11d35..d832dbdca8a47a6b7f1c29b64660d315f7c4ec26 100644
--- a/typo3/sysext/install/Classes/Controller/AbstractController.php
+++ b/typo3/sysext/install/Classes/Controller/AbstractController.php
@@ -415,7 +415,6 @@ class AbstractController {
 		}
 
 		require(\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath('extbase') . 'ext_localconf.php');
-		require(\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath('fluid') . 'ext_localconf.php');
 
 		$GLOBALS['TYPO3_CONF_VARS']['SYS']['caching']['cacheConfigurations']['extbase_datamapfactory_datamap']['backend']
 			= \TYPO3\CMS\Core\Cache\Backend\NullBackend::class;