More cleanup, use Guava Cache