diff --git a/core/lib/Drupal/Core/DependencyInjection/DependencyReinjectionTrait.php b/core/lib/Drupal/Core/DependencyInjection/DependencyReinjectionTrait.php
index fcdf447..4109d3c 100644
--- a/core/lib/Drupal/Core/DependencyInjection/DependencyReinjectionTrait.php
+++ b/core/lib/Drupal/Core/DependencyInjection/DependencyReinjectionTrait.php
@@ -2,19 +2,20 @@
 
 /**
  * @file
- * Contains \Drupal\Core\DependencyInjection\DependencyReinjectionTrait.
+ * Contains \Drupal\Core\DependencyInjection\DependencyReInjectionTrait.
  */
 
 namespace Drupal\Core\DependencyInjection;
+
 use Symfony\Component\DependencyInjection\ContainerInterface;
 
 /**
  * Provides a trait which automatically updates dependencies from the container.
  */
-trait DependencyReinjectionTrait {
+trait DependencyReInjectionTrait {
 
   /**
-   * Updates all external dependencies and refetch it from the container.
+   * Updates all external dependencies and re-fetch it from the container.
    *
    * @param \Symfony\Component\DependencyInjection\ContainerInterface $container
    *   The container.
diff --git a/core/lib/Drupal/Core/Extension/ModuleInstaller.php b/core/lib/Drupal/Core/Extension/ModuleInstaller.php
index 91444df..a26b44c 100644
--- a/core/lib/Drupal/Core/Extension/ModuleInstaller.php
+++ b/core/lib/Drupal/Core/Extension/ModuleInstaller.php
@@ -13,7 +13,7 @@
 use Drupal\Core\Config\ConfigFactoryInterface;
 use Drupal\Core\Config\ConfigInstallerInterface;
 use Drupal\Core\Config\ConfigManagerInterface;
-use Drupal\Core\DependencyInjection\DependencyReinjectionTrait;
+use Drupal\Core\DependencyInjection\DependencyReInjectionTrait;
 use Drupal\Core\DrupalKernelInterface;
 use Drupal\Component\Utility\String;
 use Drupal\Core\Entity\EntityManagerInterface;
@@ -31,7 +31,7 @@
  */
 class ModuleInstaller implements ModuleInstallerInterface {
 
-  use DependencyReinjectionTrait;
+  use DependencyReInjectionTrait;
 
   /**
    * The module handler.
@@ -562,7 +562,7 @@ protected function removeCacheBins($module) {
               // be extremely rare.
               if ($tag['name'] == 'cache.bin' && isset($definition['factory_service']) && isset($definition['factory_method']) && !empty($definition['arguments'])) {
                 try {
-                  $factory = \Drupal::service($definition['factory_service']);
+                  $factory = $this->kernel->getContainer()->get($definition['factory_service']);
                   if (method_exists($factory, $definition['factory_method'])) {
                     $backend = call_user_func_array(array($factory, $definition['factory_method']), $definition['arguments']);
                     if ($backend instanceof CacheBackendInterface) {