Improve cache system