Added menu cache back to implement a fix

This is still work-in-progress