Revert "Merge branch 'mcuadros-cache-key'"

This reverts commit 5a50314daec9700c6d43d246126e305cb9a401ff, reversing
changes made to 553cabb31c4ebad125ffe638e25092ecfc836b5b.