Resolve "Simplify the data store's caching strategy"

Merged David Sikter requested to merge 1088-simplify-the-data-store-s-caching-strategy into develop

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

Edited by David Sikter

Merge request reports