Edit cache issue #1