Restore caching for UserManager Original-merge: f8b67ec44c Merged-by: nielsvanvelzen <nielsvanvelzen@users.noreply.github.com> Backported-by: Joshua M. Boniface <joshua@boniface.me>
f8b67ec44c