[JBJCA-1215] Only use XidWrapper if needed