Made prepareContentForEdit() use the stash cache by default

Change-Id: I1123a8da4764df67f1b0f2b18f6ea74ec5be7be9