Yeah something like that would be ideal and much less wasteful. But I've tried to not touch core for this plugin so this little workaround will have to do for now.