Revert "Fixes for extra caching"

This reverts commit 6ca25e0a5063d4c6e840fe772059d773916f2b43.
Revert "Revert "Revert "Add extra to cache (experimental)"""

This reverts commit 77d2cd50259883b71fa5830aaddd239662887b25.