use guava's closer to replace current code path