Change timing of service creation.

Make service creation happen immediately to avoid confusion with the service cache.

Jira issue: WP-1253