Fix caching, really