Allow raw to be passed into keys function

If raw is true, then keys will include the cache id