Merge pull request #318 from jkuipers/2.1-master

Cache request attribute names in WebVariablesMap