Merge Window Property into master

This removes the old way of caching specific files and replaces it with the new window property method. Anything relying on the old way will now fail.