Bug fix in expression cache