Merge "Handle type annotations when generating cache keys"