Add caching back. [Fixes #71488806]

Introduced attempting to debug other map problems.