updated with feign pull request code to eliminate ValueHolders