Moving the URI caching around