Fixes for LazyCacheDAO
Add support for a map of choices to AbstractChoiceView