nit: My only concern is that we are utilizing this as more of a "utility" class, and not really a provider. My recommendation stands to move this out of the providers folder, or leverage it as a base class. I don't mind doing this in a follow-up patch though if I'm not clear, so it won't block the review.