diff --git a/core/lib/Drupal/Core/Extension/ModuleInstaller.php b/core/lib/Drupal/Core/Extension/ModuleInstaller.php
index ab6afe2..5035836 100644
--- a/core/lib/Drupal/Core/Extension/ModuleInstaller.php
+++ b/core/lib/Drupal/Core/Extension/ModuleInstaller.php
@@ -14,7 +14,7 @@
 use Drupal\Core\Config\ConfigManagerInterface;
 use Drupal\Core\DrupalKernelInterface;
 use Drupal\Core\Entity\EntityManagerInterface;
-use Drupal\Core\KeyValueStore\KeyValueStoreInterface;
+use Drupal\Core\KeyValueStore\KeyValueFactoryInterface;
 use Drupal\Core\Plugin\CachedDiscoveryClearer;
 use Drupal\Core\Routing\RouteBuilderIndicatorInterface;
 use Drupal\Core\StreamWrapper\StreamWrapperManager;
@@ -113,11 +113,11 @@ class ModuleInstaller implements ModuleInstallerInterface {
   protected $configManager;
 
   /**
-   * The key value store.
+   * The key value factory.
    *
-   * @var \Drupal\Core\KeyValueStore\KeyValueStoreInterface
+   * @var \Drupal\Core\KeyValueStore\KeyValueFactoryInterface
    */
-  protected $keyValue;
+  protected $keyValueFactory;
 
   /**
    * Constructs a new ModuleInstaller instance.
@@ -146,13 +146,13 @@ class ModuleInstaller implements ModuleInstallerInterface {
    *   The logger.
    * @param \Drupal\Core\Config\ConfigManagerInterface $config_manager
    *   The config manager.
-   * @param \Drupal\Core\KeyValueStore\KeyValueStoreInterface $key_value
-   *   The key value store.
+   * @param \Drupal\Core\KeyValueStore\KeyValueFactoryInterface $key_value_factory
+   *   The key value factory.
    *
    * @see \Drupal\Core\DrupalKernel
    * @see \Drupal\Core\CoreServiceProvider
    */
-  public function __construct($root, ModuleHandlerInterface $module_handler, DrupalKernelInterface $kernel, ConfigFactoryInterface $config_factory, ConfigInstallerInterface $config_installer, CachedDiscoveryClearer $plugin_cache_clearer, RouteBuilderIndicatorInterface $route_rebuild_indicator, EntityManagerInterface $entity_manager, StreamWrapperManager $stream_wrapper_manager, ThemeHandlerInterface $theme_handler, LoggerInterface $logger, ConfigManagerInterface $config_manager, KeyValueStoreInterface $key_value) {
+  public function __construct($root, ModuleHandlerInterface $module_handler, DrupalKernelInterface $kernel, ConfigFactoryInterface $config_factory, ConfigInstallerInterface $config_installer, CachedDiscoveryClearer $plugin_cache_clearer, RouteBuilderIndicatorInterface $route_rebuild_indicator, EntityManagerInterface $entity_manager, StreamWrapperManager $stream_wrapper_manager, ThemeHandlerInterface $theme_handler, LoggerInterface $logger, ConfigManagerInterface $config_manager, KeyValueFactoryInterface $key_value_factory) {
     $this->root = $root;
     $this->moduleHandler = $module_handler;
     $this->kernel = $kernel;
@@ -165,7 +165,7 @@ public function __construct($root, ModuleHandlerInterface $module_handler, Drupa
     $this->themeHandler = $theme_handler;
     $this->logger = $logger;
     $this->configManager = $config_manager;
-    $this->keyValue = $key_value;
+    $this->keyValueFactory = $key_value_factory;
   }
 
   /**
@@ -490,7 +490,7 @@ public function uninstall(array $module_list, $uninstall_dependents = TRUE) {
 
       $this->logger->info('%module module uninstalled.', array('%module' => $module));
 
-      $this->keyValue->get('system.schema')->delete($module);
+      $this->keyValueFactory->get('system.schema')->delete($module);
     }
     drupal_get_installed_schema_version(NULL, TRUE);
 
@@ -555,6 +555,16 @@ protected function updateKernel($module_filenames) {
     // dependencies.
     $container = $this->kernel->getContainer();
     $this->moduleHandler = $container->get('module_handler');
+    $this->configFactory = $container->get('config.factory');
+    $this->configInstaller = $container->get('config.installer');
+    $this->pluginCacheClearer = $container->get('plugin.cache_clearer');
+    $this->routeRebuildIndicator = $container->get('router.builder_indicator');
+    $this->entityManager = $container->get('entity.manager');
+    $this->streamWrapperManager = $container->get('stream_wrapper_manager');
+    $this->themeHandler = $container->get('theme_handler');
+    $this->logger = $container->get('logger.channel.system');
+    $this->configManager = $container->get('config.manager');
+    $this->keyValueFactory = $container->get('keyvalue');
   }
 
 }