Genetic and non-genetic clonal diversity in cancer evolution