actually fix the caching issue