Fix caching by making the tileset part of the key