changes for caching getting stuck
