Remove shim cache, correctly check constructor arguments.