same as previous note, better add a flag on GetKeyValueCommand.
This also added quite some logic duplication in NonTxDistributionInterceptor, when the only thing that was actually  needed was 
if (returnEntry) 
    return entry.getValue() 
else
   return entry.