Update cjs to use smart caching too