Replace many # type: comments with variable annotations

But not all of them – the cachetools classes can’t be used like that
(they’re not subscriptable).