better cache ids and new toolkit version