Small performance enhancements

6 jobs for api-serializers-enhancements in 3 minutes and 56 seconds (queued for 2 seconds)