2q cache refactoring
additional tests