More code cleanup, start implementing signals as a hook for the caching layer