Temporarily removed the cache feature of the wrapper