UserManagerCaching fixes