Fixed caching of model components