Improve the internal cache routine

Now that the `File` implementation has been upgraded, we can include the
aggregated temp files just before they are moved to their final destination
instead of having to include each file separately.