Dan, as I mentioned. Maybe we can refactor the core code out of WSTrustClient into a new class in core module. Your handler can then directly call the core class. The WSTC will then just be a simple api class delegating all the work into the new class in the core.
I've checked in a suggestion for this refactoring. Please take a look and see what you think of this.