diff --git a/lib/SimpleSAML/XHTML/Template.php b/lib/SimpleSAML/XHTML/Template.php
index 47b5586ef332ad9e6c606b1d6d97fd1a14955435..4c3ea3db9255a9256dcc082a2a41e45590799aef 100644
--- a/lib/SimpleSAML/XHTML/Template.php
+++ b/lib/SimpleSAML/XHTML/Template.php
@@ -96,12 +96,12 @@ class SimpleSAML_XHTML_Template
      */
     private function setupTwig()
     {
-        // TODO: Get cache-location from config
-        $cache = $this->configuration->resolvePath('cache');
+        $cache = $this->configuration->getString('template.cache', $this->configuration->resolvePath('cache'));
         // check if template exists
         $loader = $this->setupTwigTemplatepaths();
         if (!$loader) { return false; }
-        $auto_reload = true; // TODO: set this in config
+
+        $auto_reload = $this->configuration->getBoolean('template.auto_reload', false);
         $this->twig = new \Twig_Environment($loader, array('cache' => $cache, 'auto_reload' => $auto_reload));
         return true;
     }