[wip] Fixed up cache and util scripts.