Add preparation for provider (bug 942361)

I think all of these need to be handled async, no?