Adding more tests
Refactoring the cache implementation
Changing test description