Attempting to clean up the handler interface.
Minor bug fix in dispatching the new cache handler finalize.