CAMEL-5993 : based on patch in CAMEL-5994 + unit test : avoid depending on LRU cache
CAMEL-5993 : based on patch in CAMEL-5994 + unit test : avoid depending on LRU cache