Added caching and test plan