#1530 Split type and serializer tokens and include special handling for CachedTypeSerializer (this should also fix #1527)