new model caching: fixing the rest of the specs.