Add preparation for provider (bug 942361)

``providerInst`` would be more consistent