Updated LazyCacheDAO to be more flexible and more efficient.
Fix type problem with ContainedInICExpr