[FIX] Caching issues for popups