[FXOS-157] some shortcuts cleanup and refactorin + suggestions cache