Fixed #25 -- Made sure the tenant instance attached to its model is retrived from the cache.