default timeouts a dict, no longer need check
missed the json.loads previously
Merge branch 'cache-cleanup' of github.com:criswell/openmicroscopy into cache-cleanup