diff --git a/framework/src/play/Play.java b/framework/src/play/Play.java
index d3372c6ac8..45e31d8d4a 100644
--- a/framework/src/play/Play.java
+++ b/framework/src/play/Play.java
@@ -515,9 +515,11 @@ public void run() {
 
         } catch (PlayException e) {
             started = false;
+            try { Cache.stop(); } catch(Exception ignored) {}
             throw e;
         } catch (Exception e) {
             started = false;
+            try { Cache.stop(); } catch(Exception ignored) {}
             throw new UnexpectedException(e);
         }
     }