Added caching and more tests for the store controller