Undo Cache fix v0.1