fixed caching bug
abandoned caching efforts. will revisit if performance becomes an issues
Merge branch 'staging'