When counting the number of queries(e.g. IdentityMap), we cannot touch firm when saving a Client
Add a instance var, which if set to true would touch the parent.
If you wanna to cherry-pick this to master is ok too.
on tests: dont always touch firm on validate