faster version only exposed on dev for the time being
merging in changes from master branch
cleaning up new caching method