slight edit to caching