Remove notion of DataStorePlugin. CachingGitDataStore is the DataStore service