Remove cache tokens from ExtraTokenTypes

[pawbana]

Follow up from #150

#229 added dedicated cached tokens fields but kept old entries in ExtraTokenTypes for easier transition from one format to the new one. Finally cached tokens should be removed from ExtraTokenTypes.

Example change: 6480378