Made caching tenant aware