Ability to disable gadget caching

Change-Id: Ic1653ae896ac0fd7c0165ecee76f807feea6edcf
Merge "Ability to disable gadget caching"