#1075 - Make cache keys multi-tenant aware