Simplify caching logic