update: exclude type and end keywords as field names, fix enum caching, other fixes