🔀 Merge upstream

.github/workflows/ci-cd.yml

@@ -19,7 +19,7 @@ jobs:
         run: pipx install poetry
       - name: Setup Python
         id: setup-python
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: '3.x'
           cache: poetry
@@ -51,7 +51,7 @@ jobs:
       - uses: actions/checkout@v3
       - name: Install Poetry
         run: pipx install poetry
-      - uses: actions/setup-python@v4
+      - uses: actions/setup-python@v5
         with:
           python-version: "${{ matrix.python }}"
           cache: poetry
@@ -83,7 +83,7 @@ jobs:
       - name: Install Poetry
         run: pipx install poetry
       - name: Setup Python
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: '3.x'
           cache: poetry

.github/workflows/towncrier.yml

@@ -28,7 +28,7 @@ jobs:
       run: pipx install poetry
     - name: Setup Python
       id: setup-python
-      uses: actions/setup-python@v4
+      uses: actions/setup-python@v5
       with:
         python-version: '3.x'
         cache: poetry

README.md

@@ -51,6 +51,9 @@ or
 ### Quick Start
 
 ```python
+from collections.abc import AsyncIterator
+from contextlib import asynccontextmanager
+
 from fastapi import FastAPI
 from starlette.requests import Request
 from starlette.responses import Response
@@ -74,12 +77,11 @@ async def get_cache():
 async def index():
     return dict(hello="world")
 
-
-@app.on_event("startup")
-async def startup():
+@asynccontextmanager
+async def lifespan(_: FastAPI) -> AsyncIterator[None]:
     redis = aioredis.from_url("redis://localhost")
     FastAPICache.init(RedisBackend(redis), prefix="fastapi-cache")
-
+    yield
 ```
 
 ### Initialization

fastapi_cache/decorator.py

@@ -193,13 +193,13 @@ async def ensure_async_func(*args: P.args, **kwargs: P.kwargs) -> R:
             assert isinstance(cache_key, str)  # noqa: S101  # assertion is a type guard
 
             try:
-                ttl, cached = await backend.get_with_ttl(cache_key)
+                cached = await backend.get(cache_key)
             except Exception:
                 logger.warning(
                     f"Error retrieving cache key '{cache_key}' from backend:",
                     exc_info=True,
                 )
-                ttl, cached = 0, None
+                cached = None  # noqa: F841
 
             # Determine cache-control value
             cache_control = ""
@@ -230,14 +230,14 @@ async def ensure_async_func(*args: P.args, **kwargs: P.kwargs) -> R:
                     response.headers.update(
                         {
                             "Cache-Control": cache_control,
-                            "ETag": f"W/{hashlib.md5(to_cache.encode()).hexdigest()}",
+                            "ETag": f"W/{hashlib.md5(to_cache.encode()).hexdigest()}",  #noqa: S324
                             cache_status_header: "MISS",
                         }
                     )
 
             else:  # cache hit
                 if response:
-                    etag = f"W/{hashlib.md5(cached.encode()).hexdigest()}"
+                    etag = f"W/{hashlib.md5(cached.encode()).hexdigest()}"   #noqa: S324
                     response.headers.update(
                         {
                             "Cache-Control": cache_control,