[TASK] Cleanup cache clearing