Fix for projects without server definition, and uri->server cache