diff --git a/src/main/java/de/ph87/isabell_und_timo/picture/PictureController.java b/src/main/java/de/ph87/isabell_und_timo/picture/PictureController.java
index fa70497..00d8c2a 100644
--- a/src/main/java/de/ph87/isabell_und_timo/picture/PictureController.java
+++ b/src/main/java/de/ph87/isabell_und_timo/picture/PictureController.java
@@ -94,6 +94,12 @@ public class PictureController {
       log.warn("Tried accessing NON-EXISTENT picture: {}", request);
       return new ResponseStatusException(HttpStatus.NOT_FOUND);
     });
+
+    final int cacheDuration = 30 * 24 * 60 * 60;
+    response.setHeader("Cache-Control", "public, max-age=" + cacheDuration);
+    response.setDateHeader("Expires", System.currentTimeMillis() + (cacheDuration * 1000L));
+    response.setDateHeader("Last-Modified", System.currentTimeMillis());
+
     try (final FileInputStream input = new FileInputStream(pictureDto.getPreviewPath().toFile())) {
       response.getOutputStream().write(input.readAllBytes());
     }