Hmm, that could also remove the need to expose the buildWrapper method.