fixup! implement RFC-5861 in CachingPolicyManager
fixup! fix unicodeconflictresolver that was causing the same error when logging the problematic text