Add support for ids > 256, remove cache