Revert "Add extra to cache (experimental)"

This reverts commit 6b77a375163c9a367029c96424e5bedd1a3cd01e.