Update Guava and switch to LoadingCache