Improve cache init