This made the cache not work as intended, causing a major slowdown. See #9478 for discussion and context. Authored-by: Anthony Sottile <asottile@umich.edu>