Caching finished - hopefully