Added caching remote server modes