diff --git a/CHANGELOG.md b/CHANGELOG.md
index 74ca3141e..38bf03653 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -15,6 +15,7 @@
 - Improved `filelist.php` [\#1586](https://github.com/torrentpier/torrentpier/pull/1586) ([belomaxorka](https://github.com/belomaxorka))
 - Demo mode: Save user language in cookies [\#1584](https://github.com/torrentpier/torrentpier/pull/1584) ([belomaxorka](https://github.com/belomaxorka))
 - BBCode: Fixed relative links working [\#1613](https://github.com/torrentpier/torrentpier/pull/1613) ([belomaxorka](https://github.com/belomaxorka))
+- Fixed template caching issue [\#1622](https://github.com/torrentpier/torrentpier/pull/1622) ([belomaxorka](https://github.com/belomaxorka))
 - Fixed `md5()` deprecated in PHP 8.4 [\#1561](https://github.com/torrentpier/torrentpier/pull/1561) ([belomaxorka](https://github.com/belomaxorka))
 - Increased `USEREMAIL_MAX_LENGTH` [\#1566](https://github.com/torrentpier/torrentpier/pull/1566) ([belomaxorka](https://github.com/belomaxorka))
 - Minor improvements [\#1570](https://github.com/torrentpier/torrentpier/pull/1570), [\#1571](https://github.com/torrentpier/torrentpier/pull/1571), [\#1575](https://github.com/torrentpier/torrentpier/pull/1575), [\#1589](https://github.com/torrentpier/torrentpier/pull/1589), [\#1592](https://github.com/torrentpier/torrentpier/pull/1592), [\#1605](https://github.com/torrentpier/torrentpier/pull/1605), [\#1611](https://github.com/torrentpier/torrentpier/pull/1611), [\#1612](https://github.com/torrentpier/torrentpier/pull/1612), [\#1615](https://github.com/torrentpier/torrentpier/pull/1615) ([belomaxorka](https://github.com/belomaxorka))
diff --git a/src/Legacy/Template.php b/src/Legacy/Template.php
index 63a16b8b2..0fc2c4602 100644
--- a/src/Legacy/Template.php
+++ b/src/Legacy/Template.php
@@ -793,7 +793,7 @@ class Template
 
         for ($i = 0; $i < $tokens_cnt; $i++) {
             $token = &$tokens[$i];
-            $token = $token ?? '';
+            $token ??= '';
 
             switch ($token) {
                 case 'eq':
@@ -982,7 +982,7 @@ class Template
      */
     public function write_cache($filename, $code)
     {
-        file_write($code, $filename, max_size: false, replace_content: true);
+        return file_write($code, $filename, max_size: false, replace_content: true);
     }
 
     public function xs_startup()