Revert "Revert "Add extra to cache (experimental)""

This reverts commit 2209e3e1f0e8fefc58d7b827ed11cf2f05c15c69.