touched key for WATCH refactored into a more general thing that can be used also for the cache system. Some more changes towards diskstore working.