diff --git a/pom.xml b/pom.xml
index bd68090..081ae7a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -74,9 +74,9 @@
             <version>${openhtml.version}</version>
         </dependency>
         <dependency>
-            <groupId>com.mitchellbosecke</groupId>
+            <groupId>io.pebbletemplates</groupId>
             <artifactId>pebble</artifactId>
-            <version>2.4.0</version>
+            <version>3.1.4</version>
         </dependency>
         <dependency>
             <groupId>org.junit.jupiter</groupId>
diff --git a/src/main/kotlin/Modules.kt b/src/main/kotlin/Modules.kt
index 0489ceb..cf6f3bd 100644
--- a/src/main/kotlin/Modules.kt
+++ b/src/main/kotlin/Modules.kt
@@ -43,7 +43,7 @@ val apiModule = module {
 
 val utilsModule = module {
     single { Jackson.mapper }
-    single { PebbleEngine(cache = false, prefix = "templates/") }
+    single { PebbleEngine(cache = true, prefix = "templates/") }
 }
 
 val pdfModule = module {
diff --git a/src/main/kotlin/templates/Templates.kt b/src/main/kotlin/templates/Templates.kt
index a2cf8af..af7ff49 100644
--- a/src/main/kotlin/templates/Templates.kt
+++ b/src/main/kotlin/templates/Templates.kt
@@ -1,6 +1,8 @@
 package be.simplenotes.c2c.templates
 
 import com.mitchellbosecke.pebble.PebbleEngine
+import com.mitchellbosecke.pebble.cache.tag.CaffeineTagCache
+import com.mitchellbosecke.pebble.cache.template.CaffeineTemplateCache
 import com.mitchellbosecke.pebble.loader.ClasspathLoader
 import com.mitchellbosecke.pebble.template.PebbleTemplate
 import java.io.StringWriter
@@ -18,4 +20,8 @@ fun PebbleEngine(cache: Boolean, prefix: String? = null, suffix: String? = ".twi
         PebbleEngine.Builder().loader(ClasspathLoader().also { loader ->
             prefix?.let { loader.prefix = it }
             suffix?.let { loader.suffix = it }
-        }).cacheActive(cache).build()
+        })
+                .cacheActive(cache)
+                .templateCache(CaffeineTemplateCache())
+                .tagCache(CaffeineTagCache())
+                .build()