diff --git a/core/lib/Drupal/Core/Cache/CacheFactory.php b/core/lib/Drupal/Core/Cache/CacheFactory.php
index 0a0a977..91bf104 100644
--- a/core/lib/Drupal/Core/Cache/CacheFactory.php
+++ b/core/lib/Drupal/Core/Cache/CacheFactory.php
@@ -20,9 +20,9 @@ class CacheFactory implements CacheFactoryInterface,  ContainerAwareInterface {
   use ContainerAwareTrait;
 
   /**
-   * The settings array.
+   * The cache settings array.
    *
-   * @var \Drupal\Core\Site\Settings
+   * @var array
    */
   protected $settings;
 
@@ -49,7 +49,7 @@ class CacheFactory implements CacheFactoryInterface,  ContainerAwareInterface {
    *   $settings take precedence over this.
    */
   public function __construct(Settings $settings, array $default_bin_backends = array()) {
-    $this->settings = $settings;
+    $this->cacheSettings = $settings->get('cache');
     $this->defaultBinBackends = $default_bin_backends;
   }
 
@@ -69,12 +69,11 @@ public function __construct(Settings $settings, array $default_bin_backends = ar
    *   The cache backend object associated with the specified bin.
    */
   public function get($bin) {
-    $cache_settings = $this->settings->get('cache');
-    if (isset($cache_settings['bins'][$bin])) {
-      $service_name = $cache_settings['bins'][$bin];
+    if (isset($this->cacheSettings['bins'][$bin])) {
+      $service_name = $this->cacheSettings['bins'][$bin];
     }
-    elseif (isset($cache_settings['default'])) {
-      $service_name = $cache_settings['default'];
+    elseif (isset($this->cacheSettings['default'])) {
+      $service_name = $this->cacheSettings['default'];
     }
     elseif (isset($this->defaultBinBackends[$bin])) {
       $service_name = $this->defaultBinBackends[$bin];
diff --git a/sites/default/default.services.yml b/sites/default/default.services.yml
index 516657d..31d651c 100644
--- a/sites/default/default.services.yml
+++ b/sites/default/default.services.yml
@@ -98,7 +98,7 @@ parameters:
   # - default: The container service to use by default for queues without
   #   overrides. This defaults to 'queue.database'.
   #
-  # factory.queue: {}
+  factory.queue: {}
   #
   # Reverse Proxy Configuration:
   #
@@ -136,23 +136,25 @@ parameters:
   #     This setting is required if $settings['reverse_proxy'] is TRUE.
   #   - header: Set this value if your proxy server sends the client IP in a
   #       header other than X-Forwarded-For.
-  #
+
+  reverse_proxy: {}
   # reverse_proxy:
   #   enabled: true
   #   addresses: ['a.b.c.d']
   #   header: 'HTTP_X_CLUSTER_CLIENT_IP';
-  #
+
   # Default mode for for directories and files written by Drupal.
   #
   # Value should be in PHP Octal Notation, with leading zero.
-  #
+
+  file_chmod: {}
   # file_chmod:
   #   directory: 0775
   #   file: 0664
-  #
+
   # Session write interval:
   #
   # Set the minimum interval between each session write to database.
   # For performance reasons it defaults to 180.
   #
-  # session_write_interval: 180
+  session_write_interval: 180