Simplified by not caching cluster addr