Resolve "Simplify the data store's caching strategy"

Closes #1088 (closed). The refactoring gives notable simplifications of the code and saves some api calls. All recorded tests are also refreshed.