once again improve cache