diff --git a/core/includes/bootstrap.inc b/core/includes/bootstrap.inc
index f6fb6d6..7b079e5 100644
--- a/core/includes/bootstrap.inc
+++ b/core/includes/bootstrap.inc
@@ -2431,7 +2431,7 @@ function drupal_container(Container $new_container = NULL, $rebuild = FALSE) {
       ->addArgument(config_get_config_directory(CONFIG_ACTIVE_DIRECTORY));
     // @todo Replace this with a cache.factory service plus 'config' argument.
     $container
-      ->register('cache.config')
+      ->register('cache.config', 'Drupal\Core\Cache\CacheBackendInterface')
       ->setFactoryClass('Drupal\Core\Cache\CacheFactory')
       ->setFactoryMethod('get')
       ->addArgument('config');
diff --git a/core/includes/common.inc b/core/includes/common.inc
index aea8529..ddaf103 100644
--- a/core/includes/common.inc
+++ b/core/includes/common.inc
@@ -3900,7 +3900,7 @@ function drupal_get_js($scope = 'header', $javascript = NULL, $skip_alter = FALS
     // this is an AJAX request.
     // @todo Clean up container call.
     $container = drupal_container();
-    if ($container->has('request') && $container->has('content_negotiation')) {
+    if ($container->has('content_negotiation') && $container->isScopeActive('request')) {
       $type = $container->get('content_negotiation')->getContentType($container->get('request'));
     }
     if (!empty($items['settings']) || (!empty($type) && $type == 'ajax')) {
diff --git a/core/includes/file.inc b/core/includes/file.inc
index f1c6ac9..3a91ac7 100644
--- a/core/includes/file.inc
+++ b/core/includes/file.inc
@@ -1441,7 +1441,9 @@ function file_scan_directory($dir, $mask, $options = array(), $depth = 0) {
 
   $options['key'] = in_array($options['key'], array('uri', 'filename', 'name')) ? $options['key'] : 'uri';
   $files = array();
-  if (is_dir($dir) && $handle = opendir($dir)) {
+  // Avoid warnings when opendir does not have the permissions to open a
+  // directory.
+  if (is_dir($dir) && $handle = @opendir($dir)) {
     while (FALSE !== ($filename = readdir($handle))) {
       if (!preg_match($options['nomask'], $filename) && $filename[0] != '.') {
         $uri = "$dir/$filename";
diff --git a/core/includes/module.inc b/core/includes/module.inc
index 215d165..5c89ca9 100644
--- a/core/includes/module.inc
+++ b/core/includes/module.inc
@@ -119,7 +119,7 @@ function module_list_reset() {
  * Builds a list of bootstrap modules and enabled modules and themes.
  *
  * @param $type
- *   The type of list to return:
+ *   (optional) The type of list to return:
  *   - module_enabled: All enabled modules.
  *   - bootstrap: All enabled modules required for bootstrap.
  *   - theme: All themes.
@@ -133,13 +133,13 @@ function module_list_reset() {
  * @see module_list()
  * @see list_themes()
  */
-function system_list($type) {
+function system_list($type = NULL) {
   $lists = &drupal_static(__FUNCTION__);
 
   // For bootstrap modules, attempt to fetch the list from cache if possible.
   // if not fetch only the required information to fire bootstrap hooks
   // in case we are going to serve the page from cache.
-  if ($type == 'bootstrap') {
+  if ($type === 'bootstrap') {
     if (isset($lists['bootstrap'])) {
       return $lists['bootstrap'];
     }
@@ -193,6 +193,7 @@ function system_list($type) {
           $lists['filepaths'][] = array('type' => $record->type, 'name' => $record->name, 'filepath' => $record->filename);
         }
       }
+      $lists['module_enabled_hash'] = hash('sha256', implode(',', array_keys($lists['module_enabled'])));
       foreach ($lists['theme'] as $key => $theme) {
         if (!empty($theme->info['base theme'])) {
           // Make a list of the theme's base themes.
@@ -228,7 +229,7 @@ function system_list($type) {
     }
   }
 
-  return $lists[$type];
+  return $type ? $lists[$type] : $lists;
 }
 
 /**
diff --git a/core/lib/Drupal/Component/PhpStorage/FileReadOnlyStorage.php b/core/lib/Drupal/Component/PhpStorage/FileReadOnlyStorage.php
index 3d1bd95..81a155c 100644
--- a/core/lib/Drupal/Component/PhpStorage/FileReadOnlyStorage.php
+++ b/core/lib/Drupal/Component/PhpStorage/FileReadOnlyStorage.php
@@ -69,4 +69,11 @@ class FileReadOnlyStorage implements PhpStorageInterface {
   protected function getFullPath($name) {
     return $this->directory . '/' . $name;
   }
+
+  /**
+   * Implements Drupal\Component\PhpStorage\PhpStorageInterface::writeable().
+   */
+  function writeable() {
+    return FALSE;
+  }
 }
diff --git a/core/lib/Drupal/Component/PhpStorage/FileStorage.php b/core/lib/Drupal/Component/PhpStorage/FileStorage.php
index 80f3ec4..1f690f9 100644
--- a/core/lib/Drupal/Component/PhpStorage/FileStorage.php
+++ b/core/lib/Drupal/Component/PhpStorage/FileStorage.php
@@ -71,4 +71,11 @@ class FileStorage implements PhpStorageInterface {
   protected function getFullPath($name) {
     return $this->directory . '/' . $name;
   }
+
+  /**
+   * Implements Drupal\Component\PhpStorage\PhpStorageInterface::writeable().
+   */
+  function writeable() {
+    return TRUE;
+  }
 }
diff --git a/core/lib/Drupal/Component/PhpStorage/PhpStorageInterface.php b/core/lib/Drupal/Component/PhpStorage/PhpStorageInterface.php
index 1eaece3..8b5e271 100644
--- a/core/lib/Drupal/Component/PhpStorage/PhpStorageInterface.php
+++ b/core/lib/Drupal/Component/PhpStorage/PhpStorageInterface.php
@@ -57,6 +57,13 @@ interface PhpStorageInterface {
   public function save($name, $code);
 
   /**
+   * Whether this is a writeable storage.
+   *
+   * @return bool
+   */
+  public function writeable();
+
+  /**
    * Deletes PHP code from storage.
    *
    * @param string $name
diff --git a/core/lib/Drupal/Core/CoreBundle.php b/core/lib/Drupal/Core/CoreBundle.php
index 4ad6726..b278148 100644
--- a/core/lib/Drupal/Core/CoreBundle.php
+++ b/core/lib/Drupal/Core/CoreBundle.php
@@ -53,25 +53,6 @@ class CoreBundle extends Bundle
       ->setFactoryMethod('getConnection')
       ->addArgument('slave');
 
-    // @todo Replace below lines with the commented out block below it when it's
-    //   performant to do so: http://drupal.org/node/1706064.
-    $dispatcher = $container->get('dispatcher');
-    $matcher = new \Drupal\Core\LegacyUrlMatcher();
-    $content_negotation = new \Drupal\Core\ContentNegotiation();
-    $dispatcher->addSubscriber(new \Drupal\Core\EventSubscriber\RouterListener($matcher));
-    $dispatcher->addSubscriber(new \Drupal\Core\EventSubscriber\ViewSubscriber($content_negotation));
-    $dispatcher->addSubscriber(new \Drupal\Core\EventSubscriber\AccessSubscriber());
-    $dispatcher->addSubscriber(new \Drupal\Core\EventSubscriber\MaintenanceModeSubscriber());
-    $dispatcher->addSubscriber(new \Drupal\Core\EventSubscriber\PathSubscriber());
-    $dispatcher->addSubscriber(new \Drupal\Core\EventSubscriber\LegacyRequestSubscriber());
-    $dispatcher->addSubscriber(new \Drupal\Core\EventSubscriber\LegacyControllerSubscriber());
-    $dispatcher->addSubscriber(new \Drupal\Core\EventSubscriber\FinishResponseSubscriber());
-    $dispatcher->addSubscriber(new \Drupal\Core\EventSubscriber\RequestCloseSubscriber());
-    $dispatcher->addSubscriber(new \Drupal\Core\EventSubscriber\ConfigGlobalOverrideSubscriber());
-    $container->set('content_negotiation', $content_negotation);
-    $dispatcher->addSubscriber(\Drupal\Core\ExceptionController::getExceptionListener($container));
-
-    /*
     $container->register('matcher', 'Drupal\Core\LegacyUrlMatcher');
     $container->register('router_listener', 'Drupal\Core\EventSubscriber\RouterListener')
       ->addArgument(new Reference('matcher'))
@@ -96,7 +77,8 @@ class CoreBundle extends Bundle
       ->addTag('kernel.event_subscriber');
     $container->register('request_close_subscriber', 'Drupal\Core\EventSubscriber\RequestCloseSubscriber')
       ->addTag('kernel.event_subscriber');
-    $container->register('config_global_override_subscriber', '\Drupal\Core\EventSubscriber\ConfigGlobalOverrideSubscriber');
+    $container->register('config_global_override_subscriber', 'Drupal\Core\EventSubscriber\ConfigGlobalOverrideSubscriber')
+      ->addTag('kernel.event_subscriber');
     $container->register('exception_listener', 'Symfony\Component\HttpKernel\EventListener\ExceptionListener')
       ->addTag('kernel.event_subscriber')
       ->addArgument(new Reference('service_container'))
@@ -105,6 +87,5 @@ class CoreBundle extends Bundle
 
     // Add a compiler pass for registering event subscribers.
     $container->addCompilerPass(new RegisterKernelListenersPass(), PassConfig::TYPE_AFTER_REMOVING);
-    */
   }
 }
diff --git a/core/lib/Drupal/Core/DrupalKernel.php b/core/lib/Drupal/Core/DrupalKernel.php
index 869d4ee..497aa8d 100644
--- a/core/lib/Drupal/Core/DrupalKernel.php
+++ b/core/lib/Drupal/Core/DrupalKernel.php
@@ -8,10 +8,12 @@
 namespace Drupal\Core;
 
 use Drupal\Core\CoreBundle;
+use Drupal\Component\PhpStorage\PhpStorageInterface;
 use Symfony\Component\HttpKernel\Kernel;
 use Drupal\Core\DependencyInjection\ContainerBuilder;
 use Symfony\Component\Config\Loader\LoaderInterface;
 use Symfony\Component\DependencyInjection\ParameterBag\ParameterBag;
+use Symfony\Component\DependencyInjection\Dumper\PhpDumper;
 
 /**
  * The DrupalKernel class is the core of Drupal itself.
@@ -26,6 +28,21 @@ use Symfony\Component\DependencyInjection\ParameterBag\ParameterBag;
 class DrupalKernel extends Kernel {
 
   /**
+   * @var array The name of the container class.
+   */
+  protected $systemList;
+
+  public function __construct($environment, $debug, $system_list = NULL) {
+    parent::__construct($environment, $debug);
+    if (isset($system_list)) {
+      $this->systemList = $system_list;
+    }
+    else {
+      $this->systemList = system_list();
+    }
+  }
+
+  /**
    * Overrides Kernel::init().
    */
   public function init() {
@@ -43,9 +60,7 @@ class DrupalKernel extends Kernel {
       new CoreBundle(),
     );
 
-    // @todo Remove the necessity of calling system_list() to find out which
-    // bundles exist. See http://drupal.org/node/1331486
-    $modules = array_keys(system_list('module_enabled'));
+    $modules = array_keys($this->systemList['module_enabled']);
     foreach ($modules as $module) {
       $camelized = ContainerBuilder::camelize($module);
       $class = "Drupal\\{$module}\\{$camelized}Bundle";
@@ -61,12 +76,42 @@ class DrupalKernel extends Kernel {
    * Initializes the service container.
    */
   protected function initializeContainer() {
-    // @todo We should be compiling the container and dumping to php so we don't
-    //   have to recompile every time. There is a separate issue for this, see
-    //   http://drupal.org/node/1668892.
-    $this->container = $this->buildContainer();
+    // While the default Symfony class name only depends on the environment, for
+    // testing purposes we can't use that because there would be a collision as
+    // each test method creates a new kernel. On the other hand, the container
+    // only depends on the enabled modules (and only on those that provide
+    // bundles) so we base the name of the container class on the hash of the
+    // enabled modules. We can't directly use the hash though because PHP
+    // identifiers always start with a letter and hashes don't so we add a
+    // character to the beginning. This mechanism also avoids the problem of
+    // needing to rebuild the DIC at the right time on module enable: simply on
+    // the next request the hash will change and so the container will be
+    // rebuilt.
+    $class = 'c' . $this->systemList['module_enabled_hash'];
+    $cache_file = $class . '.php';
+
+    $storage = drupal_php_storage('service_container');
+    // First, try to load.
+    if (!class_exists($class)) {
+      $storage->load($cache_file);
+    }
+    // If the load succeeded or the class already existed, use it.
+    if (class_exists($class)) {
+      $this->container = new $class;
+    }
+    else {
+      $this->container = $this->buildContainer();
+      if (!$this->dumpDrupalContainer($cache_file, $this->container, $class, $this->getContainerBaseClass(), $storage)) {
+        $exception = 'Container cannot be written to disk';
+      }
+    }
     $this->container->set('kernel', $this);
+
     drupal_container($this->container);
+
+    if (isset($exception)) {
+      watchdog('DrupalKernel', $exception);
+    }
   }
 
   /**
@@ -84,10 +129,7 @@ class DrupalKernel extends Kernel {
     foreach ($this->bundles as $bundle) {
       $bundle->build($container);
     }
-
-    // @todo Compile the container: http://drupal.org/node/1706064.
-    //$container->compile();
-
+    $container->compile();
     return $container;
   }
 
@@ -101,6 +143,41 @@ class DrupalKernel extends Kernel {
   }
 
   /**
+   * Dumps the service container to PHP code in the config directory.
+   *
+   * This method is based on the dumpContainer method in the parent class, but
+   * that method is reliant on the Config component which we do not use here.
+   *
+   * @param string $cache_file
+   *   The full filename to write to.
+   * @param ContainerBuilder $container
+   *   The service container.
+   * @param string $class
+   *   The name of the class to generate.
+   * @param string $baseClass
+   *   The name of the container's base class
+   * @param PhpStorageInterface $storage
+   *   The PHP storage class.
+   *
+   * @return bool
+   *   TRUE if the container was successfully dumped to disk.
+   */
+  protected function dumpDrupalContainer($cache_file, ContainerBuilder $container, $class, $baseClass, PhpStorageInterface $storage) {
+    if (!$storage->writeable()) {
+      return FALSE;
+    }
+    // Cache the container.
+    $dumper = new PhpDumper($container);
+    $content = $dumper->dump(array('class' => $class, 'base_class' => $baseClass));
+
+    if (!$this->debug) {
+      $content = self::stripComments($content);
+    }
+
+    return $storage->save($cache_file, $content);
+  }
+
+  /**
    * Overrides and eliminates this method from the parent class. Do not use.
    *
    * This method is part of the KernelInterface interface, but takes an object
diff --git a/core/lib/Drupal/Core/EventSubscriber/FinishResponseSubscriber.php b/core/lib/Drupal/Core/EventSubscriber/FinishResponseSubscriber.php
index 8065349..e341e46 100644
--- a/core/lib/Drupal/Core/EventSubscriber/FinishResponseSubscriber.php
+++ b/core/lib/Drupal/Core/EventSubscriber/FinishResponseSubscriber.php
@@ -7,6 +7,7 @@
 
 namespace Drupal\Core\EventSubscriber;
 
+use Drupal\Core\Language\LanguageManager;
 use Symfony\Component\HttpKernel\Event\FilterResponseEvent;
 use Symfony\Component\HttpKernel\KernelEvents;
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
@@ -16,6 +17,12 @@ use Symfony\Component\EventDispatcher\EventSubscriberInterface;
  */
 class FinishResponseSubscriber implements EventSubscriberInterface {
 
+  protected $language_manager;
+
+  public function __construct(LanguageManager $language_manager) {
+    $this->language_manager = $language_manager;
+  }
+
   /**
    * Sets extra headers on successful responses.
    *
@@ -30,10 +37,7 @@ class FinishResponseSubscriber implements EventSubscriberInterface {
     $response->headers->set('X-UA-Compatible', 'IE=edge,chrome=1', false);
 
     // Set the Content-language header.
-    // @todo Receive the LanguageManager object as a constructor argument when
-    //   the dependency injection container allows for it performantly:
-    //   http://drupal.org/node/1706064.
-    $response->headers->set('Content-language', language(LANGUAGE_TYPE_INTERFACE)->langcode);
+    $response->headers->set('Content-language', $this->language_manager->getLanguage(LANGUAGE_TYPE_INTERFACE)->langcode);
 
     // Because pages are highly dynamic, set the last-modified time to now
     // since the page is in fact being regenerated right now.
diff --git a/core/modules/system/lib/Drupal/system/Tests/DrupalKernel/DrupalKernelTest.php b/core/modules/system/lib/Drupal/system/Tests/DrupalKernel/DrupalKernelTest.php
new file mode 100644
index 0000000..f313197
--- /dev/null
+++ b/core/modules/system/lib/Drupal/system/Tests/DrupalKernel/DrupalKernelTest.php
@@ -0,0 +1,105 @@
+<?php
+
+/**
+ * @file
+ * Definition of Drupal\system\Tests\DrupalKernel\DrupalKernelTest.
+ */
+
+namespace Drupal\system\Tests\DrupalKernel;
+
+use Drupal\Core\DrupalKernel;
+use Drupal\simpletest\UnitTestBase;
+use ReflectionClass;
+
+/**
+ * Test compilation of the DIC.
+ */
+class DrupalKernelTest extends UnitTestBase {
+
+  public static function getInfo() {
+    return array(
+      'name' => 'DrupalKernel tests',
+      'description' => 'Tests DIC compilation to disk.',
+      'group' => 'DrupalKernel',
+    );
+  }
+
+  /**
+   * Test DIC compilation.
+   */
+  function testCompileDIC() {
+    // Because we'll be instantiating a new kernel during this test, the
+    // container stored in drupal_container() will be updated as a side effect.
+    // We need to be able to restore it to the correct one at the end of this
+    // test.
+    $original_container = drupal_container();
+    global $conf;
+    $conf['php_storage']['service_container'] = array(
+      'class' => 'Drupal\Component\PhpStorage\MTimeProtectedFileStorage',
+      'secret' => $GLOBALS['drupal_hash_salt'],
+    );
+    $module_enabled = array(
+      'system' => 'system',
+      'user' => 'user',
+    );
+    $module_enabled_hash = hash('sha256', implode(',', array_keys($module_enabled)));
+    $system_list = array(
+      'module_enabled' => $module_enabled,
+      'module_enabled_hash' => $module_enabled_hash,
+    );
+    $kernel = new DrupalKernel('testing', FALSE, $system_list);
+    $kernel->boot();
+    // Instantiate it a second time and we should get the compiled Container
+    // class.
+    $kernel = new DrupalKernel('testing', FALSE, $system_list);
+    $kernel->boot();
+    $container = $kernel->getContainer();
+    $refClass = new ReflectionClass($container);
+    $is_compiled_container =
+      $refClass->getParentClass()->getName() == 'Symfony\Component\DependencyInjection\Container' &&
+      !$refClass->isSubclassOf('Symfony\Component\DependencyInjection\ContainerBuilder');
+    $this->assertTrue($is_compiled_container);
+    // We make this assertion here purely to show that the new container below
+    // is functioning correctly, i.e. we get a brand new ContainerBuilder
+    // which has the required new services.
+    $this->assertFalse($container->has('bundle_test_class'));
+
+    // Reset the container.
+    drupal_container(NULL, TRUE);
+
+    // Now use the read-only storage implementation
+    drupal_static_reset('drupal_php_storage');
+    $conf['php_storage']['service_container'] = array(
+      'class' => 'Drupal\Component\PhpStorage\FileReadOnlyStorage',
+    );
+
+    // Add another module so that a different hash is used for the class name
+    // and we can test that the new module's bundle is registered to the new
+    // container.
+    $module_enabled = array(
+      'system' => 'system',
+      'user' => 'user',
+      'bundle_test' => 'bundle_test',
+    );
+    $module_enabled_hash = hash('sha256', implode(',', array_keys($module_enabled)));
+    $system_list = array(
+      'module_enabled' => $module_enabled,
+      'module_enabled_hash' => $module_enabled_hash,
+    );
+    $kernel = new DrupalKernel('testing', FALSE, $system_list);
+    $kernel->boot();
+    // Instantiate it a second time and we should still get a ContainerBuilder
+    // class.
+    $kernel = new DrupalKernel('testing', FALSE, $system_list);
+    $kernel->boot();
+    $container = $kernel->getContainer();
+    $refClass = new ReflectionClass($container);
+    $is_container_builder = $refClass->isSubclassOf('Symfony\Component\DependencyInjection\ContainerBuilder');
+    $this->assertTrue($is_container_builder);
+    // Assert that the new module's bundle was registered to the new container.
+    $this->assertTrue($container->has('bundle_test_class'));
+
+    // Restore the original container.
+    drupal_container($original_container);
+  }
+}
diff --git a/core/modules/system/tests/modules/bundle_test/lib/Drupal/bundle_test/BundleTestBundle.php b/core/modules/system/tests/modules/bundle_test/lib/Drupal/bundle_test/BundleTestBundle.php
index 768a1b0..c124007 100644
--- a/core/modules/system/tests/modules/bundle_test/lib/Drupal/bundle_test/BundleTestBundle.php
+++ b/core/modules/system/tests/modules/bundle_test/lib/Drupal/bundle_test/BundleTestBundle.php
@@ -20,9 +20,5 @@ class BundleTestBundle extends Bundle
   public function build(ContainerBuilder $container) {
     $container->register('bundle_test_class', 'Drupal\bundle_test\TestClass')
       ->addTag('kernel.event_subscriber');
-
-    // @todo Remove when the 'kernel.event_subscriber' tag above is made to
-    //   work: http://drupal.org/node/1706064.
-    $container->get('dispatcher')->addSubscriber($container->get('bundle_test_class'));
   }
 }
diff --git a/core/scripts/run-tests.sh b/core/scripts/run-tests.sh
index 2395a84..5aa8b22 100755
--- a/core/scripts/run-tests.sh
+++ b/core/scripts/run-tests.sh
@@ -479,7 +479,7 @@ function simpletest_script_cleanup($test_id, $test_class, $exitcode) {
     // simpletest_clean_temporary_directories() cannot be used here, since it
     // would also delete file directories of other tests that are potentially
     // running concurrently.
-    file_unmanaged_delete_recursive($test_directory);
+    file_unmanaged_delete_recursive($test_directory, array('Drupal\simpletest\TestBase', 'filePreDeleteCallback'));
     $messages[] = "- Removed test files directory.";
   }