Fix caching issues temporarily