Updated caching issues