Hopefully fix caching once and for all