WELD-1430 Use optimized session keys if possible