Make sure the template cache can be used if "template.auto_reload" is set to true.

config-templates/config.php

@@ -725,14 +725,19 @@ $config = array(
      *
      * By default, twig templates are not cached. To turn on template caching:
      * Set 'template.cache' to an absolute path pointing to a directory that
-     * SimpleSAMLphp has read and write permissions to. Then, set
-     * 'template.auto_reload' to false.
-     *
-     * When upgrading or changing themes, delete the contents of the cache.
+     * SimpleSAMLphp has read and write permissions to.
      */
-    'template.auto_reload' => true,
     //'template.cache' => '',
 
+    /*
+     * Set the 'template.auto_reload' to true if you would like SimpleSAMLphp to
+     * recompile the templates (when using the template cache) if the templates
+     * change. If you don't want to check the source templates for every request,
+     * set it to false.
+     */
+    'template.auto_reload' => false,
+
+
 
     /*********************
      | DISCOVERY SERVICE |

lib/SimpleSAML/XHTML/Template.php

@@ -162,11 +162,7 @@ class SimpleSAML_XHTML_Template
     private function setupTwig()
     {
         $auto_reload = $this->configuration->getBoolean('template.auto_reload', true);
-        $cache = false;
-        if (!$auto_reload) {
-            // Cache only used if auto_reload = false
-            $cache = $this->configuration->getString('template.cache', $this->configuration->resolvePath('cache'));
-        }
+        $cache = $this->configuration->getString('template.cache', false);
         // set up template paths
         $loader = $this->setupTwigTemplatepaths();
         // abort if twig template does not exist