Moar caching fixes