ada1acb32f
Same basic approach as #11105, including a cache version bump. Fixes #12274
Same basic approach as #11105, including a cache version bump. Fixes #12274