don't ignore treaty info, and update cache path to mirror data path, for convenience