Continue to simplify some of the provider async handler classes