[TASK] Improve cache performance