Merge "Move WAN cache classes under a new wancache/ directory"