add caching and updated tests for store
Merge remote-tracking branch 'origin/master'