updated caches to handle exceptions