Fixed issue with caching