Merge "Ensure the getCredentialType cache gets enabled" into udc-qpr-dev