Better annotation caching