add missing module, fix cache logic