improve tenant caching performance
improve tenant caching performance

stuartf/Hilary,simong/Hilary,jfederico/Hilary,timdegroote/Hilary,mrvisser/Hilary,simong/Hilary,stuartf/Hilary,jfederico/Hilary,Orodan/Hilary,mrvisser/Hilary,Orodan/Hilary,nicolaasmatthijs/Hilary,timdegroote/Hilary,nicolaasmatthijs/Hilary