plan caching changes from ch.
Merge branch 'master' of github.com:ClothesHorse/Destrier