HHH-8243 - Omit flushing in validity audit strategy

HHH-8243 - Omit flushing in validity audit strategy

HHH-8243 - Refactoring