Better integration
Fix cache reload
Update doc
Update doc