Static serve wrapper to handle kwarg

Import commit 83262d7a4aa421d1568ed614b5a0528f4e46d211 from williambr