Cleanup storage when content changes. Fixes #2