Update WrapperInterface
Add caching system