Exercise caution when designing a "night air" thermal store for cooling warm summer air during the day. Great care must be taken to avoid condensation inside the system and mold formation. There must be an answer for this but I don't know it yet.
For storing warm air in the winter, I have read about a hybrid material storage from the Delaney house postings at builditsolar.com
Masonry block will absorb whatever solar heat is available much quicker than buckets/drums of water, but water will hold 5 times the BTU's than masonry by volume.
Heat comes out of the top of the collectors and is directed to the top of the insulated heat store containment. Whether pumped by fan or thermosiphon, the warm air sinks while shedding heat. The top half is water, and the bottom half is masonry. The masonry absorbs most of the available heat.
After the sun goes down, one-way flappers stop any reverse-flow heat shedding out the collectors. Heat from the masonry slowly migrates to the water drums above it. This is important, because if the sun only comes out for a couple hours the next day, you will want to absorb as much of it as possible. The higher temperature difference from the cooler blocks in the lower half will cause more total heat absorbtion.
If you used only water, its heat uptake is slower and some of the available sun won't get absorbed. You could just use all masonry, but the heat store would need to be 4 times bigger to hold the same amount of BTU's as the hybrid store.
I haven't built one, but it is part of my future plans.