Fixed an issue with caching.