Restructed some of caching