reworked injection of ProviderIdentifierGenerator based on refactoring done as part of EA-55