Corrects cache invalidation. Id where wrong with spaces.
Merge remote-tracking branch 'origin/master'