new approach to caching: pickle the whole object and make unpickling explicit.
Merge remote-tracking branch 'upstream/master'
cheap workaround for installation problems