GADGETS-67 Fix for concurrent hibernate issues