Extend DataSet/Refactor DataStore
Add Tests for caching behaviour of DataStores.