Patch return behaviour to play nicely with features newer than the original cache protection patch.