Reintroduces caching of services