Fixes #16 -- timeouts are now correct for all caching items