Added new test methods and make caching system faster