UserPoolIdentityProvider not being handled properly by CloudFormation

I have a CloudFormation stack that provisions UserPoolIdentityProviders (OpenID Connect). The resources show up in the CloudFormation console as 'AWS::Cognito::UserPoolIdentityProvider'. I find that these identity providers will sometimes get removed from the Cognito UserPool but CloudFormation still shows them as existing. The only way to get them back is to modify the template to remove the provider, apply the change, and then modify the template again to bring the resource back. Does anyone have a workaround / suggestion?