[FIX] Potential caching issue