Go back to caching windows so we can correctly stop tracking them when applications are terminated.