Changed function plan caching mode to be more explicit and reduce planner heuristics