Make sure mutable tenant class are also retreived from cached when possible