JBIDE-14596 cleanup for caching