Fixing codegen path problem and cache delete problem.
Merge pull request #555 from spekary/bugfix-Various

bugfix-Various
Merge remote-tracking branch 'refs/remotes/qcubed/alpha-3.0' into dev-v3