added new test cases moved cache to wrapper file