Merge branch 'fix-no-cache' into fix

Author: John Lyu

fastapi_cache/decorator.py

@@ -72,7 +72,7 @@ def _uncacheable(request: Optional[Request]) -> bool:
     Returns true if:
     - Caching has been disabled globally
     - This is not a GET request
-    - The request has a Cache-Control header with a value of "no-store" or "no-cache"
+    - The request has a Cache-Control header with a value of "no-store"
 
     """
     if not FastAPICache.get_enable():
@@ -81,7 +81,7 @@ def _uncacheable(request: Optional[Request]) -> bool:
         return False
     if request.method != "GET":
         return True
-    return request.headers.get("Cache-Control") in ("no-store", "no-cache")
+    return request.headers.get("Cache-Control") == "no-store"
 
 
 def cache(
@@ -182,7 +182,7 @@ async def ensure_async_func(*args: P.args, **kwargs: P.kwargs) -> R:
                 )
                 ttl, cached = 0, None
 
-            if cached is None:  # cache miss
+            if cached is None  or (request is not None and request.headers.get("Cache-Control") == "no-cache") :  # cache miss
                 result = await ensure_async_func(*args, **kwargs)
                 to_cache = coder.encode(result)
 

tests/test_decorator.py

@@ -112,3 +112,28 @@ def test_alternate_injected_namespace() -> None:
         response = client.get("/namespaced_injection")
         assert response.headers.get("X-FastAPI-Cache") == "MISS"
         assert response.json() == {"__fastapi_cache_request": 42, "__fastapi_cache_response": 17}
+
+def test_cache_control() -> None:
+    with TestClient(app) as client:
+        response = client.get("/uncached_put")
+        assert "X-FastAPI-Cache" not in response.headers
+        assert response.json() == {"value": 1}
+
+        # HIT
+        response = client.get("/uncached_put")
+        assert response.headers.get("X-FastAPI-Cache") == "HIT"
+        assert response.json() == {"value": 1}
+
+        # no-cache
+        response = client.get("/uncached_put", headers={"Cache-Control": "no-cache"})
+        assert response.json() == {"value": 2}
+
+        response = client.get("/uncached_put")
+        assert response.json() == {"value": 2}
+
+        # no-store
+        response = client.get("/uncached_put", headers={"Cache-Control": "no-store"})
+        assert response.json() == {"value": 3}
+
+        response = client.get("/uncached_put")
+        assert response.json() == {"value": 2}