Improvements with caching