fix cachedir setup caused by upstream changes