We were making a bad merge which would cause wrong behaviour on caching
Merge branch 'fixes/submenu-cache-merge-options'