@rogpeppe suggests that -timeout simply be ignored when computing the test cache key. See https://groups.google.com/d/msg/golang-dev/qfa3mHN4ZPA/9BNft8SFAQAJ. We need to do something with -timeout, and that seems worth trying.