Small model_cache improvement