Refactor. Remove menu caching