diff --git a/accounts/pkg/server/http/server.go b/accounts/pkg/server/http/server.go
index b4a3bed7c..7f0ecd8ea 100644
--- a/accounts/pkg/server/http/server.go
+++ b/accounts/pkg/server/http/server.go
@@ -29,7 +29,7 @@ func Server(opts ...Option) http.Service {
 
 	mux.Use(middleware.RealIP)
 	mux.Use(middleware.RequestID)
-	mux.Use(middleware.Cache)
+	mux.Use(middleware.NoCache)
 	mux.Use(middleware.Cors)
 	mux.Use(middleware.Secure)
 	mux.Use(middleware.ExtractAccountUUID(
diff --git a/konnectd/pkg/server/http/server.go b/konnectd/pkg/server/http/server.go
index 1f302d3b5..bd6f081f5 100644
--- a/konnectd/pkg/server/http/server.go
+++ b/konnectd/pkg/server/http/server.go
@@ -58,7 +58,7 @@ func Server(opts ...Option) (http.Service, error) {
 		svc.Middleware(
 			middleware.RealIP,
 			middleware.RequestID,
-			middleware.Cache,
+			middleware.NoCache,
 			middleware.Cors,
 			middleware.Secure,
 			middleware.Version(
diff --git a/ocis-phoenix/pkg/server/http/server.go b/ocis-phoenix/pkg/server/http/server.go
index 00f853c75..1d35592c0 100644
--- a/ocis-phoenix/pkg/server/http/server.go
+++ b/ocis-phoenix/pkg/server/http/server.go
@@ -28,7 +28,7 @@ func Server(opts ...Option) (http.Service, error) {
 		svc.Middleware(
 			middleware.RealIP,
 			middleware.RequestID,
-			middleware.Cache,
+			middleware.NoCache,
 			middleware.Cors,
 			middleware.Secure,
 			phoenixmid.SilentRefresh,
diff --git a/ocis-pkg/middleware/header.go b/ocis-pkg/middleware/header.go
index 0b311ac60..0087d84f5 100644
--- a/ocis-pkg/middleware/header.go
+++ b/ocis-pkg/middleware/header.go
@@ -5,8 +5,8 @@ import (
 	"time"
 )
 
-// Cache writes required cache headers to all requests.
-func Cache(next http.Handler) http.Handler {
+// NoCache writes required cache headers to all requests.
+func NoCache(next http.Handler) http.Handler {
 	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 		w.Header().Set("Cache-Control", "no-cache, no-store, max-age=0, must-revalidate, value")
 		w.Header().Set("Expires", "Thu, 01 Jan 1970 00:00:00 GMT")
diff --git a/ocis-pkg/service/debug/service.go b/ocis-pkg/service/debug/service.go
index f523ed356..1771fb074 100644
--- a/ocis-pkg/service/debug/service.go
+++ b/ocis-pkg/service/debug/service.go
@@ -49,7 +49,7 @@ func NewService(opts ...Option) *http.Server {
 		Handler: alice.New(
 			middleware.RealIP,
 			middleware.RequestID,
-			middleware.Cache,
+			middleware.NoCache,
 			middleware.Cors,
 			middleware.Secure,
 			middleware.Version(
diff --git a/ocs/pkg/server/http/server.go b/ocs/pkg/server/http/server.go
index 08aa12e2a..f555a4820 100644
--- a/ocs/pkg/server/http/server.go
+++ b/ocs/pkg/server/http/server.go
@@ -26,7 +26,7 @@ func Server(opts ...Option) (http.Service, error) {
 		svc.Middleware(
 			middleware.RealIP,
 			middleware.RequestID,
-			middleware.Cache,
+			middleware.NoCache,
 			middleware.Cors,
 			middleware.Secure,
 			middleware.Version(
diff --git a/settings/pkg/server/http/server.go b/settings/pkg/server/http/server.go
index cfab78fda..d4c8819a9 100644
--- a/settings/pkg/server/http/server.go
+++ b/settings/pkg/server/http/server.go
@@ -37,7 +37,7 @@ func Server(opts ...Option) http.Service {
 
 	mux.Use(middleware.RealIP)
 	mux.Use(middleware.RequestID)
-	mux.Use(middleware.Cache)
+	mux.Use(middleware.NoCache)
 	mux.Use(middleware.Cors)
 	mux.Use(middleware.Secure)
 	mux.Use(middleware.ExtractAccountUUID(
diff --git a/webdav/pkg/server/http/server.go b/webdav/pkg/server/http/server.go
index 5811ade5f..5996322f9 100644
--- a/webdav/pkg/server/http/server.go
+++ b/webdav/pkg/server/http/server.go
@@ -26,7 +26,7 @@ func Server(opts ...Option) (http.Service, error) {
 		svc.Middleware(
 			middleware.RealIP,
 			middleware.RequestID,
-			middleware.Cache,
+			middleware.NoCache,
 			middleware.Cors,
 			middleware.Secure,
 			middleware.Version(