Fixed small issue with menu caching