Fix menu chaching