UNCACHEABLE changed in 10.4/11.1

I propose asserting the new string instead of using contains to preserve backwards compatibility. Tests will fail on 10.3 and below, but GitLab CI isn't testing these, and the code will still work on 10.3, so I think it's better to require the exact value.

Merged to 4.x and a slightly different fix to 3.2.x

Automatically closed - issue fixed for 2 weeks with no activity.