This looks like it will fix the issue, I will merge for the release today.  Could we change this however, so that when the origin is updated it sends it's updated time to the listeners and the listeners all use the same updated time so that if there are multiple the cache is used.