Fix bug when fetching cached