Like for like change here would also ensure the cluster is cached, ie

```java
    CmServerCluster cluster = new CmServerCluster();
    clusterCache.put(new Key(spec), cluster);
```