Issue 760: Update internal caches to use Guava's CacheBuilder API