Adding more tests and caching mechanism