Remove helper class
Use native java8 code
Use new cache