Fix caching.