Given most of this classes above is package protected, I'll refactor those and write a method that does this internally as part of the API. I'll post back when I'm done.
No need for this, as I can simply move this service into that package.
And if there is really a need, I can hide its impl details later on.