removed reference to cached_*