Cache Keywords, analyse keywords not raw query.
Fix specs, new rspec syntax.