Moved tenant and associated models cache logic to a model manager