Refactor ServiceDescriptorsUpdater out of CachingServiceSelector