Fix caching for both logged-in and non-logged in, Remove Add Partner/Participant temporarily