Comment 14 for bug 1098685

The patch had fallen prey to an unexpected effect of commit 9619a1b and its dropping want_dojo being on all the time.

I've adjusted and rebased it (and added the cache key stuff); new branch is user/gmcharlt/lp1098685_rebase.