JBIDE-14363 addition of cache