SI-7747 Support class based wrappers as alternative through a switch.

This is a re-implementation after feedback on #2788.