diff --git a/samples/Sample.Uno/App.xaml.cs b/samples/Sample.Uno/App.xaml.cs
index 78f751a..3dd9bb6 100644
--- a/samples/Sample.Uno/App.xaml.cs
+++ b/samples/Sample.Uno/App.xaml.cs
@@ -60,7 +60,9 @@ protected async override void OnLaunched(LaunchActivatedEventArgs args)
                         .Section<AppConfig>()
                 )
                 .UseNavigation(RegisterRoutes)
-                .AddShinyMediator()
+                .AddShinyMediator(x => x
+                    .AddUnoPersistentCache()
+                )
                 .ConfigureServices(s => s.AddDiscoveredMediatorHandlersFromSample_Uno())
             );
         
diff --git a/samples/Sample.Uno/Presentation/MainPage.xaml b/samples/Sample.Uno/Presentation/MainPage.xaml
index 9469145..3536036 100644
--- a/samples/Sample.Uno/Presentation/MainPage.xaml
+++ b/samples/Sample.Uno/Presentation/MainPage.xaml
@@ -11,6 +11,7 @@
                 <RowDefinition Height="Auto" />
                 <RowDefinition />
             </Grid.RowDefinitions>
+            
             <utu:NavigationBar Content="Shiny Mediator" />
 
             <StackPanel Grid.Row="1" 
@@ -18,17 +19,24 @@
                         HorizontalAlignment="Center"
                         VerticalAlignment="Center"
                         Spacing="16">
-                <TextBlock Text="{Binding OfflineResultText}" />
-                <TextBlock Text="{Binding OfflineDate}" />
+                
+                <TextBlock Text="{x:Bind ViewModel.OfflineResultText}" 
+                           TintColor="Black" />
+                
+                <TextBlock Text="{x:Bind ViewModel.OfflineDate}" 
+                           TintColor="Black" />
                 
                 <Button Content="Run Offline" 
-                        Command="{Binding OfflineCommand}"/>
+                        Command="{x:Bind ViewModel.OfflineCommand}"/>
                 
                 <Button Content="Test Exception Handler"
-                        Command="{Binding ErrorTrapCommand}" />
+                        Command="{x:Bind ViewModel.ErrorTrapCommand}" />
                 
                 <Button Content="Publish Event"
-                        Command="{Binding PublishEventCommand}" />
+                        Command="{x:Bind ViewModel.PublishEventCommand}" />
+                
+                <Button Content="Go To Second Page"
+                        Command="{x:Bind ViewModel.GoToSecondPageCommand}" />
             </StackPanel>
         </Grid>
     </ScrollViewer>
diff --git a/samples/Sample.Uno/Presentation/MainPage.xaml.cs b/samples/Sample.Uno/Presentation/MainPage.xaml.cs
index b3a5398..2d1706e 100644
--- a/samples/Sample.Uno/Presentation/MainPage.xaml.cs
+++ b/samples/Sample.Uno/Presentation/MainPage.xaml.cs
@@ -6,4 +6,6 @@ public MainPage()
     {
         this.InitializeComponent();
     }
+    
+    public MainViewModel? ViewModel => DataContext as MainViewModel;
 }
\ No newline at end of file
diff --git a/samples/Sample.Uno/Presentation/MainViewModel.cs b/samples/Sample.Uno/Presentation/MainViewModel.cs
index c2dfb95..a8394fc 100644
--- a/samples/Sample.Uno/Presentation/MainViewModel.cs
+++ b/samples/Sample.Uno/Presentation/MainViewModel.cs
@@ -23,10 +23,17 @@ async Task Offline()
     }
 
     [RelayCommand]
-    Task PublishEvent() => mediator.Publish(new AppEvent("Hello from SecondViewModel"));
+    async Task PublishEvent()
+    {
+        await mediator.Publish(new AppEvent("Hello from SecondViewModel"));
+        await navigator.ShowMessageDialogAsync(this, title: "Done", content: "Publish message sent successfully");
+    }
 
     [RelayCommand]
     Task ErrorTrap() => mediator.Send(new ErrorCommand());
+    
+    [RelayCommand]
+    Task GoToSecondPage() => navigator.NavigateViewModelAsync<SecondViewModel>(this);
 
     public async Task Handle(AppEvent @event, EventContext<AppEvent> context, CancellationToken cancellationToken)
     {
diff --git a/samples/Sample.Uno/Presentation/SecondPage.xaml.cs b/samples/Sample.Uno/Presentation/SecondPage.xaml.cs
index eeeaa1c..43f4190 100644
--- a/samples/Sample.Uno/Presentation/SecondPage.xaml.cs
+++ b/samples/Sample.Uno/Presentation/SecondPage.xaml.cs
@@ -6,4 +6,6 @@ public SecondPage()
     {
         this.InitializeComponent();
     }
+    
+    public SecondViewModel? ViewModel => DataContext as SecondViewModel;
 }
\ No newline at end of file
diff --git a/src/Shiny.Mediator.AppSupport/Infrastructure/OfflineService.cs b/src/Shiny.Mediator.AppSupport/Infrastructure/OfflineService.cs
index 888eec8..fdc9d0d 100644
--- a/src/Shiny.Mediator.AppSupport/Infrastructure/OfflineService.cs
+++ b/src/Shiny.Mediator.AppSupport/Infrastructure/OfflineService.cs
@@ -21,16 +21,19 @@ public class OfflineService(IStorageService storage, ISerializerService serializ
     public async Task<string> Set(object request, object result)
     {
         var requestKey = Utils.GetRequestKey(request);
-        await this.DoTransaction(dict =>
-        {
-            dict[requestKey] = new OfflineStore(
-                this.GetTypeKey(request.GetType()),
-                requestKey,
-                DateTimeOffset.UtcNow,
-                serializer.Serialize(result)
-            );
-            return true;
-        });
+        await this
+            .DoTransaction(dict =>
+            {
+                dict[requestKey] = new OfflineStore(
+                    this.GetTypeKey(request.GetType()),
+                    requestKey,
+                    DateTimeOffset.UtcNow,
+                    serializer.Serialize(result)
+                );
+                return true;
+            })
+            .ConfigureAwait(false);
+        
         return requestKey;
     }
 
@@ -92,23 +95,30 @@ public Task Clear() => this.DoTransaction(dict =>
     });
 
 
-    SemaphoreSlim semaphore = new(1, 1);
-    Dictionary<string, OfflineStore> cache = null!;
+    readonly SemaphoreSlim semaphore = new(1, 1);
+    Dictionary<string, OfflineStore>? cache = null!;
+    
     Task DoTransaction(Func<IDictionary<string, OfflineStore>, bool> action) => Task.Run(async () =>
     {
         await this.semaphore.WaitAsync();
         if (this.cache == null)
         {
             var dict = await storage
-                .Get<Dictionary<string, OfflineStore>>(nameof(IStorageService))
+                .Get<Dictionary<string, OfflineStore>>(nameof(OfflineService))
                 .ConfigureAwait(false);
 
             this.cache = dict ?? new();
         }
         var result = action(this.cache);
         if (result)
-            await storage.Set(nameof(IStorageService), this.cache).ConfigureAwait(false);
-
+        {
+            await storage
+                .Set(
+                    nameof(OfflineService),
+                    this.cache
+                )
+                .ConfigureAwait(false);
+        }
         this.semaphore.Release();
     });
     
diff --git a/src/Shiny.Mediator.AppSupport/Infrastructure/StorageCacheService.cs b/src/Shiny.Mediator.AppSupport/Infrastructure/StorageCacheService.cs
index a2877e5..530b502 100644
--- a/src/Shiny.Mediator.AppSupport/Infrastructure/StorageCacheService.cs
+++ b/src/Shiny.Mediator.AppSupport/Infrastructure/StorageCacheService.cs
@@ -1,5 +1,3 @@
-using Shiny.Mediator.Caching;
-
 namespace Shiny.Mediator.Infrastructure;
 
 
@@ -17,7 +15,10 @@ public class StorageCacheService(IStorageService storage) : ICacheService
     // TODO: check expiry or clear it out?
     public async Task<CacheEntry<T>?> GetOrCreate<T>(string key, Func<Task<T>> factory, CacheItemConfig? config = null)
     {
-        var e = await storage.Get<InternalCacheEntry<T>>(key).ConfigureAwait(false);
+        var e = await storage
+            .Get<InternalCacheEntry<T>>(key)
+            .ConfigureAwait(false);
+        
         if (e != null)
         {
             if (e.ExpiresAt != null && e.ExpiresAt > DateTimeOffset.UtcNow)
diff --git a/src/Shiny.Mediator.Uno/Infrastructure/AlertDialogService.cs b/src/Shiny.Mediator.Uno/Infrastructure/AlertDialogService.cs
index 4348b88..3b58281 100644
--- a/src/Shiny.Mediator.Uno/Infrastructure/AlertDialogService.cs
+++ b/src/Shiny.Mediator.Uno/Infrastructure/AlertDialogService.cs
@@ -1,24 +1,24 @@
-using Microsoft.Extensions.Logging;
-using Microsoft.UI.Xaml.Controls;
+using Uno.Extensions.Navigation;
 
 namespace Shiny.Mediator.Infrastructure;
 
 
-public class AlertDialogService(ILogger<AlertDialogService> logger) : IAlertDialogService
+public class AlertDialogService(INavigator navigator) : IAlertDialogService
 {
-    public void Display(string title, string message)
+    public async void Display(string title, string message)
     {
-        // TODO: could use acr userdialogs
-        // ContentDialog deleteFileDialog = new ContentDialog
-        // {
-        //     Title = "Delete file permanently?",
-        //     Content = "If you delete this file, you won't be able to recover it. Do you want to delete it?",
-        //     PrimaryButtonText = "Delete",
-        //     CloseButtonText = "Cancel"
-        // };
-        //
-        // deleteFileDialog.XamlRoot = anyLoadedControl.XamlRoot;
-        //
-        // ContentDialogResult result = await deleteFileDialog.ShowAsync();
+        try
+        {
+            await navigator.ShowMessageDialogAsync(
+                this,
+                title: title, 
+                content: message
+            );
+            
+        }
+        catch (Exception ex)
+        {
+            Console.WriteLine(ex);
+        }
     }
 }
\ No newline at end of file
diff --git a/src/Shiny.Mediator.Uno/Infrastructure/StorageService.cs b/src/Shiny.Mediator.Uno/Infrastructure/StorageService.cs
index 62f6644..3e8c25e 100644
--- a/src/Shiny.Mediator.Uno/Infrastructure/StorageService.cs
+++ b/src/Shiny.Mediator.Uno/Infrastructure/StorageService.cs
@@ -1,3 +1,4 @@
+using System.IO;
 using Windows.Storage;
 
 namespace Shiny.Mediator.Infrastructure;
@@ -5,10 +6,9 @@ namespace Shiny.Mediator.Infrastructure;
 
 public class StorageService(ISerializerService serializer) : IStorageService
 {
-    static readonly StorageFolder local = ApplicationData.Current.LocalFolder;
-    
     public async Task Set<T>(string key, T value)
     {
+        var local = ApplicationData.Current.LocalFolder;
         var json = serializer.Serialize(value);
         var file = await local.CreateFileAsync(key, CreationCollisionOption.ReplaceExisting);
         await FileIO.WriteTextAsync(file, json);
@@ -17,10 +17,12 @@ public async Task Set<T>(string key, T value)
 
     public async Task<T?> Get<T>(string key)
     {
-        var file = await local.GetFileAsync(key);
-        if (file == null)
+        var local = ApplicationData.Current.LocalFolder;
+        var fn = Path.Combine(local.Path, key);
+        if (!File.Exists(fn))
             return default;
-
+        
+        var file = await local.GetFileAsync(key);
         var json = await FileIO.ReadTextAsync(file);
         if (String.IsNullOrWhiteSpace(json))
             return default;
@@ -32,6 +34,7 @@ public async Task Set<T>(string key, T value)
     
     public  async Task Remove(string key)
     {
+        var local = ApplicationData.Current.LocalFolder;
         var file = await local.GetFileAsync(key);
         if (file != null)
             await file.DeleteAsync();
@@ -43,6 +46,7 @@ public  async Task Remove(string key)
 
     async Task DeleteBy(string? startsWith)
     {
+        var local = ApplicationData.Current.LocalFolder;
         var files = await local.GetFilesAsync();
         foreach (var file in files)
         {
diff --git a/src/Shiny.Mediator.Uno/UnoExtensions.cs b/src/Shiny.Mediator.Uno/UnoExtensions.cs
index 6f1af49..54c99d3 100644
--- a/src/Shiny.Mediator.Uno/UnoExtensions.cs
+++ b/src/Shiny.Mediator.Uno/UnoExtensions.cs
@@ -20,6 +20,20 @@ public static ShinyConfigurator UseUno(this ShinyConfigurator cfg)
         cfg.AddUnoInfrastructure();
         return cfg;
     }
+
+
+    /// <summary>
+    /// 
+    /// </summary>
+    /// <param name="cfg"></param>
+    /// <returns></returns>
+    public static ShinyConfigurator AddUnoPersistentCache(this ShinyConfigurator cfg)
+    {
+        cfg.AddUnoInfrastructure();
+        cfg.AddCaching<StorageCacheService>();
+        return cfg;
+    }
+    
     
     /// <summary>
     /// Add Shiny Mediator to Uno