diff --git a/core/core.services.yml b/core/core.services.yml
index 19e683c..a77b0fd 100644
--- a/core/core.services.yml
+++ b/core/core.services.yml
@@ -92,12 +92,10 @@ services:
     arguments: ['@database']
     tags:
       - { name: cache.tag }
-      - { name: persist }
   cache.tag.memory:
     class: Drupal\Core\Cache\MemoryTagBackend
     tags:
       - { name: cache.tag }
-      - { name: persist }
   config.cachedstorage.storage:
     class: Drupal\Core\Config\FileStorage
     factory_class: Drupal\Core\Config\FileStorageFactory
diff --git a/core/lib/Drupal/Core/Installer/InstallerServiceProvider.php b/core/lib/Drupal/Core/Installer/InstallerServiceProvider.php
index 2d8a651..a3f5de9 100644
--- a/core/lib/Drupal/Core/Installer/InstallerServiceProvider.php
+++ b/core/lib/Drupal/Core/Installer/InstallerServiceProvider.php
@@ -31,10 +31,14 @@ public function register(ContainerBuilder $container) {
     $container->register('config.storage', 'Drupal\Core\Config\InstallStorage');
 
     // Replace services with in-memory implementations.
-    $definition = $container->getDefinition('cache_factory');
-    $definition->setClass('Drupal\Core\Cache\MemoryBackendFactory');
-    $definition->setArguments(array(new Reference('cache_tag_factory')));
-    $definition->setMethodCalls(array());
+    // @todo Revert and inject cache tag service when refactored to avoid the
+    //   cache tag factory.
+    foreach (array('bootstrap', 'discovery', 'default', 'data', 'render') as $bin) {
+      $container
+        ->register("cache.$bin", 'Drupal\Core\Cache\MemoryBackend')
+        ->addArgument(new Reference('cache.tag.memory'))
+        ->addArgument($bin);
+     }
     $container
       ->register('keyvalue', 'Drupal\Core\KeyValueStore\KeyValueMemoryFactory');
     $container