Safer caching, reorged config fields

* Moved a few fields outside of the configs section
* Rearranged config fields in a more logical order
* Minor api example fix to plakate spelcheker
* Removed obsolete WAP

Change-Id: If7bcc52a873e253255759d4cae18038b228ca17d
Merge "Safer caching, reorged config fields"