Additional updates and refactors to ModelCache