Implement caching in SVC layer, move Storage into Entities from UI