Fixed incorrect caching