Remove redundant caching