Fix #604: Add option to optimizer to not un-cache
Merge pull request #669 from gzm0/no-uncache

Fix #604: Add option to optimizer to not un-cache