Avoid of multiple getState() call.
Retry policy now uses update wait wrappers of order utils.