GeekCache refactoring, and additional tests