Revert "More robust cache merging functions"
Revert "More robust cache merging functions"

This reverts commit d8917264f1b8955fc90aedc6776365f2d1927323.

neinteractiveliterature/intercode,neinteractiveliterature/intercode,neinteractiveliterature/intercode,neinteractiveliterature/intercode,neinteractiveliterature/intercode