Improvements on BaseCluster

- update func reference after retry