Merged in use-cache option and couple minor typo fixes from cache-control branch