Two tests for another corner case
Refactoring fill_test
Fixed memory leak in cache