Merge "Add new class for WiFi restractions caching"