EZB-575 : Fix JDK7 issue for compiling
EZB-280 : use a cache (no lookup every time) : Should improve performance