Better log message and failure
Fix new cache management
Cleanup code
Clean up code
Remove obsolete function
Fix fallback to GumTree for the hybrid strategy