Changing methods to correctly wrap the runnables and callables rather than the service itself