While working on r1705329 I did not notice that OrderContentWrapper was not using the same scheme than other *ContentWrapper (implementing ContentWrapper interface). This fixes it