deal with cache retrieval errors better
Merge branch 'cache-cleanup' of github.com:criswell/openmicroscopy into cache-cleanup