@zamiang Fix caching fetch until end