make memoized support additional cases
Merge branch 'master' into droos
Merge pull request #84 from dimagi/droos

change to memoized decorator