- more cache fixes
Merge branch 'watg' of github.com:watg/spree into watg