diff --git a/config-templates/config.php b/config-templates/config.php
index 442a1d3b6caa921c60a35e051b98b61cf54dbd66..fcb1ffaaf91f09337f0c0f3b6aea4ea4897c2d46 100644
--- a/config-templates/config.php
+++ b/config-templates/config.php
@@ -704,8 +704,16 @@ $config = array(
 
     /*
      * Templating options
+     *
+     * By default, twig templates are not cached. To turn on template caching:
+     * Set 'template.cache' to an aboslute 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.
      */
-    'template.auto_reload' => false,
+    'template.auto_reload' => true,
+    //'template.cache' => '',
 
 
     /*********************