Add a cache so we don't create so many shims.