Personally I would remove this storage from cart & flow, and move it to `ResourceBundle` leaving here only `*Bag` classes.