diff --git a/system/src/Grav/Common/File/CompiledFile.php b/system/src/Grav/Common/File/CompiledFile.php
index d0fdb9bd7..3caed214c 100644
--- a/system/src/Grav/Common/File/CompiledFile.php
+++ b/system/src/Grav/Common/File/CompiledFile.php
@@ -29,19 +29,14 @@ trait CompiledFile
             $modified = $this->modified();
             $class = get_class($this);
 
-            if ($file->exists()) {
-                $cache = $file->exists() ? $file->content() : null;
-            } else {
-                $cache = null;
-            }
-
+            $cache = $file->exists() ? $file->content() : null;
 
             // Load real file if cache isn't up to date (or is invalid).
             if (
-                !is_array($cache)
+                !isset($cache['@class'])
+                || $cache['@class'] != $class
                 || $cache['modified'] != $modified
                 || $cache['filename'] != $this->filename
-                || $cache['@class'] != $class
             ) {
                 // Attempt to lock the file for writing.
                 $file->lock(false);
diff --git a/system/src/Grav/Common/Grav.php b/system/src/Grav/Common/Grav.php
index 1411663e3..86a240e8b 100644
--- a/system/src/Grav/Common/Grav.php
+++ b/system/src/Grav/Common/Grav.php
@@ -1,8 +1,8 @@
 <?php
 namespace Grav\Common;
 
-use Grav\Common\Config\ConfigServiceProvider;
 use Grav\Common\Page\Pages;
+use Grav\Common\Service\ConfigServiceProvider;
 use Grav\Common\Service\StreamsServiceProvider;
 use RocketTheme\Toolbox\DI\Container;
 use RocketTheme\Toolbox\Event\EventDispatcher;
diff --git a/system/src/Grav/Common/Service/ConfigServiceProvider.php b/system/src/Grav/Common/Service/ConfigServiceProvider.php
index 36916edd1..22b5163aa 100644
--- a/system/src/Grav/Common/Service/ConfigServiceProvider.php
+++ b/system/src/Grav/Common/Service/ConfigServiceProvider.php
@@ -1,6 +1,7 @@
 <?php
-namespace Grav\Common\Config;
+namespace Grav\Common\Service;
 
+use Grav\Common\Config\Config;
 use Grav\Common\Grav;
 use Grav\Component\Blueprints\Blueprints;
 use Grav\Component\Filesystem\Folder;