diff --git a/commafeed-server/src/main/java/com/commafeed/CommaFeedApplication.java b/commafeed-server/src/main/java/com/commafeed/CommaFeedApplication.java
index 222b6548..e404fb90 100644
--- a/commafeed-server/src/main/java/com/commafeed/CommaFeedApplication.java
+++ b/commafeed-server/src/main/java/com/commafeed/CommaFeedApplication.java
@@ -1,7 +1,5 @@
 package com.commafeed;
 
-import java.time.Instant;
-
 import com.commafeed.backend.feed.FeedRefreshEngine;
 import com.commafeed.backend.service.db.DatabaseStartupService;
 import com.commafeed.backend.task.TaskScheduler;
@@ -20,8 +18,6 @@ public class CommaFeedApplication {
 	public static final String USERNAME_ADMIN = "admin";
 	public static final String USERNAME_DEMO = "demo";
 
-	public static final Instant STARTUP_TIME = Instant.now();
-
 	private final DatabaseStartupService databaseStartupService;
 	private final FeedRefreshEngine feedRefreshEngine;
 	private final TaskScheduler taskScheduler;
diff --git a/commafeed-server/src/main/java/com/commafeed/frontend/resource/FeedREST.java b/commafeed-server/src/main/java/com/commafeed/frontend/resource/FeedREST.java
index 91befeb6..9309594f 100644
--- a/commafeed-server/src/main/java/com/commafeed/frontend/resource/FeedREST.java
+++ b/commafeed-server/src/main/java/com/commafeed/frontend/resource/FeedREST.java
@@ -3,15 +3,14 @@ package com.commafeed.frontend.resource;
 import java.io.StringWriter;
 import java.nio.charset.StandardCharsets;
 import java.time.Instant;
-import java.util.Calendar;
 import java.util.Collections;
-import java.util.Date;
 import java.util.List;
 import java.util.Objects;
 
 import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.SystemUtils;
+import org.jboss.resteasy.reactive.Cache;
 import org.jboss.resteasy.reactive.RestForm;
 
 import com.commafeed.CommaFeedApplication;
@@ -80,10 +79,8 @@ import jakarta.ws.rs.PathParam;
 import jakarta.ws.rs.Produces;
 import jakarta.ws.rs.QueryParam;
 import jakarta.ws.rs.WebApplicationException;
-import jakarta.ws.rs.core.CacheControl;
 import jakarta.ws.rs.core.MediaType;
 import jakarta.ws.rs.core.Response;
-import jakarta.ws.rs.core.Response.ResponseBuilder;
 import jakarta.ws.rs.core.Response.Status;
 import jakarta.ws.rs.core.UriInfo;
 import lombok.RequiredArgsConstructor;
@@ -343,6 +340,7 @@ public class FeedREST {
 
 	@GET
 	@Path("/favicon/{id}")
+	@Cache(maxAge = 2592000)
 	@Transactional
 	@Operation(summary = "Fetch a feed's icon", description = "Fetch a feed's icon")
 	public Response getFeedFavicon(@Parameter(description = "subscription id", required = true) @PathParam("id") Long id) {
@@ -356,19 +354,7 @@ public class FeedREST {
 
 		Feed feed = subscription.getFeed();
 		Favicon icon = feedService.fetchFavicon(feed);
-		ResponseBuilder builder = Response.ok(icon.getIcon(), icon.getMediaType());
-
-		CacheControl cacheControl = new CacheControl();
-		cacheControl.setMaxAge(2592000);
-		cacheControl.setPrivate(false);
-		builder.cacheControl(cacheControl);
-
-		Calendar calendar = Calendar.getInstance();
-		calendar.add(Calendar.MONTH, 1);
-		builder.expires(calendar.getTime());
-		builder.lastModified(Date.from(CommaFeedApplication.STARTUP_TIME));
-
-		return builder.build();
+		return Response.ok(icon.getIcon(), icon.getMediaType()).build();
 	}
 
 	@POST
diff --git a/commafeed-server/src/test/java/com/commafeed/integration/rest/FeedIT.java b/commafeed-server/src/test/java/com/commafeed/integration/rest/FeedIT.java
index 1e91f079..271b3556 100644
--- a/commafeed-server/src/test/java/com/commafeed/integration/rest/FeedIT.java
+++ b/commafeed-server/src/test/java/com/commafeed/integration/rest/FeedIT.java
@@ -27,6 +27,7 @@ import com.commafeed.integration.BaseIT;
 
 import io.quarkus.test.junit.QuarkusTest;
 import io.restassured.RestAssured;
+import jakarta.ws.rs.core.HttpHeaders;
 import jakarta.ws.rs.core.MediaType;
 
 @QuarkusTest
@@ -224,6 +225,7 @@ class FeedIT extends BaseIT {
 					.get("rest/feed/favicon/{id}", subscriptionId)
 					.then()
 					.statusCode(HttpStatus.SC_OK)
+					.header(HttpHeaders.CACHE_CONTROL, "max-age=2592000")
 					.extract()
 					.response()
 					.asByteArray();