Can we turn this into taking the `PersistentEntity` and explicitly checking for the version property field so that's more closely aligned to the current usage context?