Improve how pinned providers are handled