diff --git a/Plan/dependency-reduced-pom.xml b/Plan/dependency-reduced-pom.xml
index 7b3d46293..4a214d000 100644
--- a/Plan/dependency-reduced-pom.xml
+++ b/Plan/dependency-reduced-pom.xml
@@ -306,10 +306,6 @@
           <artifactId>guice</artifactId>
           <groupId>com.google.inject</groupId>
         </exclusion>
-        <exclusion>
-          <artifactId>caffeine</artifactId>
-          <groupId>com.github.ben-manes.caffeine</groupId>
-        </exclusion>
         <exclusion>
           <artifactId>guava</artifactId>
           <groupId>com.github.ben-manes.caffeine</groupId>
diff --git a/Plan/pom.xml b/Plan/pom.xml
index ea29ad87b..316381126 100644
--- a/Plan/pom.xml
+++ b/Plan/pom.xml
@@ -122,6 +122,13 @@
             <version>2.9.0</version>
         </dependency>
 
+        <!--        Cache with invalidation -->
+        <dependency>
+            <groupId>com.github.ben-manes.caffeine</groupId>
+            <artifactId>caffeine</artifactId>
+            <version>2.6.2</version>
+        </dependency>
+
         <!--        Metrics -->
         <dependency>
             <groupId>org.bstats</groupId>
diff --git a/Plan/src/main/java/com/djrapitops/plan/system/webserver/cache/ResponseCache.java b/Plan/src/main/java/com/djrapitops/plan/system/webserver/cache/ResponseCache.java
index 772e04180..0834953af 100644
--- a/Plan/src/main/java/com/djrapitops/plan/system/webserver/cache/ResponseCache.java
+++ b/Plan/src/main/java/com/djrapitops/plan/system/webserver/cache/ResponseCache.java
@@ -1,10 +1,11 @@
 package com.djrapitops.plan.system.webserver.cache;
 
 import com.djrapitops.plan.system.webserver.response.Response;
+import com.github.benmanes.caffeine.cache.Cache;
+import com.github.benmanes.caffeine.cache.Caffeine;
 
-import java.util.HashMap;
-import java.util.Map;
 import java.util.Set;
+import java.util.concurrent.TimeUnit;
 import java.util.function.Supplier;
 
 /**
@@ -19,7 +20,9 @@ import java.util.function.Supplier;
  */
 public class ResponseCache {
 
-    private static final Map<String, Response> cache = new HashMap<>();
+    private static final Cache<String, Response> cache = Caffeine.newBuilder()
+            .expireAfterWrite(5, TimeUnit.MINUTES)
+            .build();
 
     /**
      * Constructor used to hide the public constructor
@@ -41,17 +44,7 @@ public class ResponseCache {
      * @return The Response that was cached or created by the the {@link Response} {@link Supplier}
      */
     public static Response loadResponse(String identifier, Supplier<Response> loader) {
-        Response response = loadResponse(identifier);
-
-        if (response != null) {
-            return response;
-        }
-
-        response = loader.get();
-
-        cache.put(identifier, response);
-
-        return response;
+        return cache.get(identifier, k -> loader.get());
     }
 
     /**
@@ -61,7 +54,7 @@ public class ResponseCache {
      * @return The Response that was cached or {@code null} if it wasn't
      */
     public static Response loadResponse(String identifier) {
-        return cache.get(identifier);
+        return cache.getIfPresent(identifier);
     }
 
     /**
@@ -84,21 +77,25 @@ public class ResponseCache {
      * @return true if the page is cached
      */
     public static boolean isCached(String identifier) {
-        return cache.containsKey(identifier);
+        return cache.getIfPresent(identifier) != null;
     }
 
     /**
      * Clears the cache from all its contents.
      */
     public static void clearCache() {
-        cache.clear();
+        cache.invalidateAll();
     }
 
     public static Set<String> getCacheKeys() {
-        return cache.keySet();
+        return cache.asMap().keySet();
+    }
+
+    public static long getEstimatedSize() {
+        return cache.estimatedSize();
     }
 
     public static void clearResponse(String identifier) {
-        cache.remove(identifier);
+        cache.invalidate(identifier);
     }
 }