Use the return value form `uncacheKey`.

Use the return value from `uncacheKey` where applicable.

See #233.