Changed cached ID generation