diff --git a/middleware/cache.go b/middleware/cache.go
index 99f3d25..5e92cf4 100644
--- a/middleware/cache.go
+++ b/middleware/cache.go
@@ -2,8 +2,11 @@ package middleware
 
 import (
 	"fmt"
+	"net/http"
 	"time"
 
+	"goweb/context"
+
 	"github.com/eko/gocache/v2/cache"
 	"github.com/eko/gocache/v2/marshaler"
 	"github.com/go-redis/redis/v8"
@@ -17,9 +20,19 @@ type CachedPage struct {
 	Headers    map[string]string
 }
 
-func PageCache(ch *cache.Cache) echo.MiddlewareFunc {
+func ServeCachedPage(ch *cache.Cache) echo.MiddlewareFunc {
 	return func(next echo.HandlerFunc) echo.HandlerFunc {
 		return func(c echo.Context) error {
+			// Skip non GET requests
+			if c.Request().Method != http.MethodGet {
+				return next(c)
+			}
+
+			// Skip if the user is authenticated
+			if c.Get(context.AuthenticatedUserKey) != nil {
+				return next(c)
+			}
+
 			res, err := marshaler.New(ch).Get(c.Request().Context(), c.Request().URL.String(), new(CachedPage))
 			if err != nil {
 				if err == redis.Nil {
diff --git a/routes/router.go b/routes/router.go
index a68ea7f..4603d5d 100644
--- a/routes/router.go
+++ b/routes/router.go
@@ -51,7 +51,7 @@ func BuildRouter(c *services.Container) {
 		echomw.TimeoutWithConfig(echomw.TimeoutConfig{
 			Timeout: c.Config.App.Timeout,
 		}),
-		middleware.PageCache(c.Cache),
+		middleware.ServeCachedPage(c.Cache),
 		session.Middleware(sessions.NewCookieStore([]byte(c.Config.App.EncryptionKey))),
 		echomw.CSRFWithConfig(echomw.CSRFConfig{
 			TokenLookup: "form:csrf",