Fixed user menu

Fixes #149
Fixes #151
Fixed cache builder for user menu