Fix to caching