Fix java8 integration for Supplier