Update and get ready to start a provider on change.

Closes #5996, #5997.