#373 - Fix remaining issues with refreshing CartState when an Order is persisted