tweak input types for caching