Improve cache control