Double check state in persisted model jobs (#22565)

These loops could be long running, so before removing or adding a cache
we should double check that the state of the persisted info is still
valid for the job.