Added some test cases, caching issue