Merge pull request #3318 from dimagi/cache-cleanup

cleanup cache invalidation
add CachedCouchDocumentMixin and use for default consumption values