Caching error fix