Improve caching performance