Optimize self.instances of onecluster's onecluster provider
Use @property_hash and prefetch in onecluster's onecluster provider
Merge branch 'fix/cluster' into fix/all