=sam #3843 Use ClusterSingletonProxy in cluster samples

The new ClusterSingletonProxy by @giovannibotta is really nice.