Fix for failing MapContainerTest on windows. All file handles were not being closed on a Store.close() call. also updated to make more use of generics.