BRANCH 4.1:
  added more fast calc_mode test for expression
  fixed an issue in expression by unifying the key for expression so there's no mismatch when getting the sobjects and flat cache for an expression