Why is it supposed to be an investment? If it's sufficiently cheap, it becomes something that you buy because it's useful to you, not because the government is promising you subsidies for life.
Also, the other driving force here is the cost of grid-delivered energy. California is sure working hard on incentivizing solar + storage that way...