Simplified this module by making it no longer implicitly memoize data