Fix issue with caching