That's just bad implementation on our part. I'm happy to work with you on making that work for your use case, but yes a patch would be helpful.