Split up resetting and updating caches