Pick caching fix into 14.1

Pick !428 (merged), !429 (merged), !430 (merged), and !433 (merged) into %14.1.

The one we want is !430 (merged), but others are dependencies of it (+ a test fix).