model caching: first attempt to fix.