diff --git a/change_log.txt b/change_log.txt
index 12212b6f..6f6a9d94 100644
--- a/change_log.txt
+++ b/change_log.txt
@@ -4,6 +4,8 @@
     https://github.com/smarty-php/smarty/issues/327
   - bugfix templates filepath with multibyte characters did not work
     https://github.com/smarty-php/smarty/issues/385
+  - bugfix {make_nocache} did display code if the template did not contain other nocache code
+    https://github.com/smarty-php/smarty/issues/369
 
 09.8.2017
   - improvement repeated delimiter like {{ and }} will be treated as literal
diff --git a/libs/Smarty.class.php b/libs/Smarty.class.php
index c4b5e049..7d39e6c1 100644
--- a/libs/Smarty.class.php
+++ b/libs/Smarty.class.php
@@ -108,7 +108,7 @@ class Smarty extends Smarty_Internal_TemplateBase
     /**
      * smarty version
      */
-    const SMARTY_VERSION = '3.1.32-dev-21';
+    const SMARTY_VERSION = '3.1.32-dev-22';
 
     /**
      * define variable scopes
diff --git a/libs/sysplugins/smarty_internal_compile_make_nocache.php b/libs/sysplugins/smarty_internal_compile_make_nocache.php
index 720dd68b..fd816239 100644
--- a/libs/sysplugins/smarty_internal_compile_make_nocache.php
+++ b/libs/sysplugins/smarty_internal_compile_make_nocache.php
@@ -55,6 +55,7 @@ class Smarty_Internal_Compile_Make_Nocache extends Smarty_Internal_CompileBase
         if ($compiler->template->caching) {
             $output = "<?php \$_smarty_tpl->smarty->ext->_make_nocache->save(\$_smarty_tpl, {$_attr[ 'var' ]});\n?>\n";
             $compiler->has_code = true;
+            $compiler->template->compiled->has_nocache_code = true;
             $compiler->suppressNocacheProcessing = true;
             return $output;
         } else {