removed unuseful caching.