Refactor Cache put to use a hook, to be cleaner.  Also update setup.