diff --git a/change_log.txt b/change_log.txt
index d490f794..4b187988 100644
--- a/change_log.txt
+++ b/change_log.txt
@@ -1,4 +1,7 @@
  ===== 3.1.22-dev ===== (xx.xx.2015)
+ 15.03.2015
+ - bugfix  $smarty->compile_check must be restored before rendering of a just updated cache file {forum 25452}
+ 
  14.03.2015
  - bugfix  {nocache}  {/nocache} tags corrupted code when used within a nocache section caused by a nocache template variable.
  
diff --git a/libs/sysplugins/smarty_internal_template.php b/libs/sysplugins/smarty_internal_template.php
index 49a70c0c..4c53bfb3 100644
--- a/libs/sysplugins/smarty_internal_template.php
+++ b/libs/sysplugins/smarty_internal_template.php
@@ -258,8 +258,11 @@ class Smarty_Internal_Template extends Smarty_Internal_TemplateBase
                 $this->cached->updateCache($this, $content, $no_output_filter);
                 $compile_check = $this->smarty->compile_check;
                 $this->smarty->compile_check = false;
-                $content = $this->cached->render($this);
+                if (!$this->cached->processed) {
+                    $this->cached->process($this);
+                }
                 $this->smarty->compile_check = $compile_check;
+                $content = $this->getRenderedTemplateCode();
                 if ($this->smarty->debugging) {
                     Smarty_Internal_Debug::end_cache($this);
                 }