First draft of consumption cache rework
Finish consumption modifications
Fix tests
Merge branch 'master' into consumption-fix
Remove no longer used domain value
Merge pull request #201 from dimagi/consumption-fix

Consumption fix