add OIS + client caching