It serves a purpose and a rework of the cache won't be coming anytime soon. This partially reverts commit 8427292eb7.
8427292eb7