BACKLOG-4121 + BACKLOG-4122: Fix navigation menu cache issue