Fix caching issues