Fix incorrect caching