Fix Regression

I know it's not cool to submit big PR but... here it is.

1. b5d59e2 and 5ec825b fixes a regression bug that made invalidating the cache on save failed.
2. 7a3422e try to fix #8.

This extension really needs :heart: Integration branch is way behind BTW.