Added a few more tests and got rid of broken caching attempt.