[FEATURE] Simplify cache clearing