Change timing of service creation.

Make service creation happen immediately to avoid confusion with the service cache.

Jira issue: WP-1253
Merge pull request #5 from TobyEalden/service-disco-fixes

Change timing of service creation.