diff --git a/modules/cms/classes/CmsCompoundObject.php b/modules/cms/classes/CmsCompoundObject.php
index 6b5346198..67c7cd35b 100644
--- a/modules/cms/classes/CmsCompoundObject.php
+++ b/modules/cms/classes/CmsCompoundObject.php
@@ -322,7 +322,8 @@ class CmsCompoundObject extends CmsObject
 
         self::$objectComponentPropertyMap = $objectComponentMap;
 
-        Cache::put($key, base64_encode(serialize($objectComponentMap)), Config::get('cms.parsedPageCacheTTL', 10));
+        $expiresAt = now()->addMinutes(Config::get('cms.parsedPageCacheTTL', 10));
+        Cache::put($key, base64_encode(serialize($objectComponentMap)), $expiresAt);
 
         if (array_key_exists($componentName, $objectComponentMap[$objectCode])) {
             return $objectComponentMap[$objectCode][$componentName];
diff --git a/modules/cms/classes/CodeParser.php b/modules/cms/classes/CodeParser.php
index 033832203..ce68fc3a2 100644
--- a/modules/cms/classes/CodeParser.php
+++ b/modules/cms/classes/CodeParser.php
@@ -222,7 +222,8 @@ class CodeParser
         $cached = $this->getCachedInfo() ?: [];
         $cached[$this->filePath] = $cacheItem;
 
-        Cache::put($this->dataCacheKey, base64_encode(serialize($cached)), 1440);
+        $expiresAt = now()->addMinutes(1440);
+        Cache::put($this->dataCacheKey, base64_encode(serialize($cached)), $expiresAt);
 
         self::$cache[$this->filePath] = $result;
     }
diff --git a/modules/cms/classes/Router.php b/modules/cms/classes/Router.php
index 002bfd686..d98cc142b 100644
--- a/modules/cms/classes/Router.php
+++ b/modules/cms/classes/Router.php
@@ -127,10 +127,11 @@ class Router
                             : $fileName;
 
                         $key = $this->getUrlListCacheKey();
+                        $expiresAt = now()->addMinutes(Config::get('cms.urlCacheTtl', 1));
                         Cache::put(
                             $key,
                             base64_encode(serialize($urlList)),
-                            Config::get('cms.urlCacheTtl', 1)
+                            $expiresAt
                         );
                     }
                 }
@@ -251,7 +252,8 @@ class Router
 
             $this->urlMap = $map;
             if ($cacheable) {
-                Cache::put($key, base64_encode(serialize($map)), Config::get('cms.urlCacheTtl', 1));
+                $expiresAt = now()->addMinutes(Config::get('cms.urlCacheTtl', 1));
+                Cache::put($key, base64_encode(serialize($map)), $expiresAt);
             }
 
             return false;
diff --git a/modules/cms/classes/Theme.php b/modules/cms/classes/Theme.php
index 8fabc4bf5..de190f986 100644
--- a/modules/cms/classes/Theme.php
+++ b/modules/cms/classes/Theme.php
@@ -155,7 +155,8 @@ class Theme
         if (App::hasDatabase()) {
             try {
                 try {
-                    $dbResult = Cache::remember(self::ACTIVE_KEY, 1440, function () {
+                    $expiresAt = now()->addMinutes(1440);
+                    $dbResult = Cache::remember(self::ACTIVE_KEY, $expiresAt, function () {
                         return Parameter::applyKey(self::ACTIVE_KEY)->value('value');
                     });
                 }
diff --git a/modules/cms/traits/UrlMaker.php b/modules/cms/traits/UrlMaker.php
index 210922cfa..ebe0c050f 100644
--- a/modules/cms/traits/UrlMaker.php
+++ b/modules/cms/traits/UrlMaker.php
@@ -190,7 +190,8 @@ trait UrlMaker
             'mtime'    => @File::lastModified($filePath)
         ];
 
-        Cache::put($key, serialize($cached), Config::get('cms.parsedPageCacheTTL', 1440));
+        $expiresAt = now()->addMinutes(Config::get('cms.parsedPageCacheTTL', 1440));
+        Cache::put($key, serialize($cached), $expiresAt);
 
         return static::$urlPageName = $baseFileName;
     }
diff --git a/modules/system/classes/MediaLibrary.php b/modules/system/classes/MediaLibrary.php
index 859fa056d..f07abe510 100644
--- a/modules/system/classes/MediaLibrary.php
+++ b/modules/system/classes/MediaLibrary.php
@@ -134,10 +134,11 @@ class MediaLibrary
             $folderContents = $this->scanFolderContents($fullFolderPath);
 
             $cached[$fullFolderPath] = $folderContents;
+            $expiresAt = now()->addMinutes(Config::get('cms.storage.media.ttl', 10));
             Cache::put(
                 $this->cacheKey,
                 base64_encode(serialize($cached)),
-                Config::get('cms.storage.media.ttl', 10)
+                $expiresAt
             );
         }
 
diff --git a/modules/system/classes/UpdateManager.php b/modules/system/classes/UpdateManager.php
index 8d4b43419..1c3d4617d 100644
--- a/modules/system/classes/UpdateManager.php
+++ b/modules/system/classes/UpdateManager.php
@@ -703,7 +703,8 @@ class UpdateManager
         }
 
         $data = $this->requestServerData($type.'/popular');
-        Cache::put($cacheKey, base64_encode(serialize($data)), 60);
+        $expiresAt = now()->addMinutes(60);
+        Cache::put($cacheKey, base64_encode(serialize($data)), $expiresAt);
 
         foreach ($data as $product) {
             $code = array_get($product, 'code', -1);