Add exception for insert entities to re-map after flush