HHH-8243 - Avoid flushing in validity audit strategy