[3.11] [3.12] gh-112618: Make Annotated cache typed (GH-112619) (GH-112628) (#112633)

[3.12] gh-112618: Make Annotated cache typed (GH-112619) (GH-112628)
(cherry picked from commit 2a378ca2efcb91db4b04fb4e052424fd610ffbc9)

Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>