Moving commented-out element caching code to separate branch

Related to #36