Merge branch 'main' into fix-no-cache

examples/in_memory/main.py

@@ -1,5 +1,6 @@
 # pyright: reportGeneralTypeIssues=false
-from typing import Dict, Optional
+from contextlib import asynccontextmanager
+from typing import AsyncIterator, Dict, Optional
 
 import pendulum
 import uvicorn
@@ -11,7 +12,13 @@ from pydantic import BaseModel
 from starlette.requests import Request
 from starlette.responses import JSONResponse, Response
 
-app = FastAPI()
+@asynccontextmanager
+async def lifespan(_: FastAPI) -> AsyncIterator[None]:
+    FastAPICache.init(InMemoryBackend())
+    yield
+
+
+app = FastAPI(lifespan=lifespan)
 
 ret = 0
 
@@ -128,10 +135,5 @@ def namespaced_injection(
     }
 
 
-@app.on_event("startup")
-async def startup():
-    FastAPICache.init(InMemoryBackend())
-
-
 if __name__ == "__main__":
     uvicorn.run("main:app", reload=True)

examples/redis/main.py

@@ -1,5 +1,7 @@
 # pyright: reportGeneralTypeIssues=false
+from contextlib import asynccontextmanager
 import time
+from typing import AsyncIterator
 
 import pendulum
 import uvicorn
@@ -17,7 +19,15 @@ from starlette.responses import JSONResponse, Response
 import redis.asyncio as redis
 from redis.asyncio.connection import ConnectionPool
 
-app = FastAPI()
+@asynccontextmanager
+async def lifespan(_: FastAPI) -> AsyncIterator[None]:
+    pool = ConnectionPool.from_url(url="redis://redis")
+    r = redis.Redis(connection_pool=pool)
+    FastAPICache.init(RedisBackend(r), prefix="fastapi-cache")
+    yield
+
+
+app = FastAPI(lifespan=lifespan)
 
 app.mount(
     path="/static",
@@ -80,12 +90,5 @@ async def cache_response_obj():
     return JSONResponse({"a": 1})
 
 
-@app.on_event("startup")
-async def startup():
-    pool = ConnectionPool.from_url(url="redis://redis")
-    r = redis.Redis(connection_pool=pool)
-    FastAPICache.init(RedisBackend(r), prefix="fastapi-cache")
-
-
 if __name__ == "__main__":
     uvicorn.run("main:app", reload=True)