Cleanup: move lib/cache2,verify2 -> lib/cache,verify
Test fix