P001ModelSurrogate property caching fixes