Feature/use tenant name externally

As you suggested, it would be better to push the cache to the Store layer.