You wouldn't want to combine a solar cell and a battery in a single package; maybe in a modular system instead. After some amount of charge/discharge cycles the battery will quickly lose its capacity and utility. I suspect the operational lifespan of photovoltaics is much greater than the best batteries, and will continue to be for some time in the future.