No need to pass `fill_cache` anymore.