more work on cachedModel again