Cache extra
Simplify
Rehook native methods on library load

Refs #1366