Improve interceptor feature with Java8 function interfaces