Add way to not increment ChangeId after housekeeping validation Set SourceLocation in cached deserialize