diff --git a/system/defines.php b/system/defines.php
index 482a7fa0c..991264fb9 100644
--- a/system/defines.php
+++ b/system/defines.php
@@ -14,7 +14,7 @@ define('USER_PATH', 'user/');
 define('USER_DIR', ROOT_DIR . USER_PATH);
 define('SYSTEM_DIR', ROOT_DIR .'system/');
 define('ASSETS_DIR', ROOT_DIR . 'assets/');
-define('CACHE_DIR', ROOT_DIR .'cache/');
+define('CACHE_DIR', ROOT_DIR . 'cache/');
 define('IMAGES_DIR', ROOT_DIR . 'images/');
 define('LOG_DIR', ROOT_DIR .'logs/');
 define('VENDOR_DIR', ROOT_DIR .'vendor/');
diff --git a/system/src/Grav/Common/Cache.php b/system/src/Grav/Common/Cache.php
index 693562be5..aa6fe940b 100644
--- a/system/src/Grav/Common/Cache.php
+++ b/system/src/Grav/Common/Cache.php
@@ -35,6 +35,8 @@ class Cache extends Getters
      */
     protected $enabled;
 
+    protected $cache_dir;
+
     /**
      * Constructor
      *
@@ -56,6 +58,8 @@ class Cache extends Getters
         /** @var Config $config */
         $this->config = $grav['config'];
 
+        $this->cache_dir = $grav['locator']->findResource('cache://doctrine', true, true);
+
         /** @var Uri $uri */
         $uri = $grav['uri'];
 
@@ -118,7 +122,7 @@ class Cache extends Getters
                 break;
 
             default:
-                $driver = new \Doctrine\Common\Cache\FilesystemCache(CACHE_DIR);
+                $driver = new \Doctrine\Common\Cache\FilesystemCache($this->cache_dir);
                 break;
         }