Fix cache issues when creating a new Cluster