Added caching options
Chache not activated by default + better code for uninstall