[refactoring] cache refactoring (highlight)

Also, tests fixed a bit (at least they work).