cache done, errors fixed