Added caching for server connection