diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
index 0970fc75495..85b9078ec4e 100644
--- a/RELEASE_NOTES.md
+++ b/RELEASE_NOTES.md
@@ -23,6 +23,12 @@ This serves two purposes:
 - You can now add custom posts to the blog post feed component when including it directly in https://github.com/hydephp/develop/pull/1893
 - Added a `Feature::fromName()` enum helper in https://github.com/hydephp/develop/pull/1895
 - Added support for specifying features in the YAML configuration in https://github.com/hydephp/develop/pull/1896
+- **Added a new consolidated Asset API to better handle media files.**
+  - Added several new fluent methods to the `MediaFile` class, like `getLink()`, `getLength()`, `getMimeType()`, etc.
+  - Added new `HydeFront` facade to handle CDN links and Tailwind config injection.
+  - Added method `Asset::exists()` has to check if a media file exists.
+  - Added a `Hyde::assets()` method to get all media file instancess in the site.
+
 
 ### Changed
 - **Breaking:** The internals of the navigation system has been rewritten into a new Navigation API. This change is breaking for custom navigation implementations. For more information, see below.
@@ -33,6 +39,7 @@ This serves two purposes:
 - **Breaking:** The `Author::get()` method now returns `null` if an author is not found, rather than creating a new instance. For more information, see below.
 - **Breaking:** The custom navigation item configuration now uses array inputs instead of the previous format. For more information, see the upgrade guide below.
 - **Breaking:** Renamed the `hyde.navigation.subdirectories` configuration option to `hyde.navigation.subdirectory_display`.
+- **Breaking:** Renamed the `hyde.enable_cache_busting` configuration option to `hyde.cache_busting` in https://github.com/hydephp/develop/pull/1980
 - Medium: The `route` function will now throw a `RouteNotFoundException` if the route does not exist in https://github.com/hydephp/develop/pull/1741
 - Minor: Navigation menu items are now no longer filtered by duplicates (meaning two items with the same label can now exist in the same menu) in https://github.com/hydephp/develop/pull/1573
 - Minor: Due to changes in the navigation system, it is possible that existing configuration files will need to be adjusted in order for menus to look the same (in terms of ordering etc.)
@@ -60,6 +67,21 @@ This serves two purposes:
 - The build command now groups together all `InMemoryPage` instances under one progress bar group in https://github.com/hydephp/develop/pull/1897
 - The `Markdown::render()` method will now always render Markdown using the custom HydePHP Markdown service (thus getting smart features like our Markdown processors) in https://github.com/hydephp/develop/pull/1900
 - Improved how the `MarkdownService` class is accessed, by binding it into the service container, in https://github.com/hydephp/develop/pull/1922
+- Improved the media asset transfer build task to have better output in https://github.com/hydephp/develop/pull/1904
+- **Many MediaFile related helpers has been changed or completely rewritten** to provide a simplified API for interacting with media files.
+  - **Note:** For most end users, the changes will have minimal direct impact, but if you have custom code that interacts with media files, you may need to update it.
+  - The `Asset` facade has been e restructured to be more scoped and easier to use, splitting out a separate `HydeFront` facade and inlining the `AssetService` class.
+  - All asset retrieval methods now return a `MediaFile` instance, which can be fluently interacted with, or cast to a string to get the link (which was the previous behavior).
+  - The `Hyde::asset()` method and `asset()` function now return `MediaFile` instances instead of strings, and will throw an exception if the asset does not exist.
+  - Renamed method `Asset::hasMediaFile` to `Asset::exists` in https://github.com/hydephp/develop/pull/1957
+  - Renamed method `MediaFile::getContentLength` to `MediaFile::getLength` in https://github.com/hydephp/develop/pull/1904
+  - Replaced method `Hyde::mediaPath` with `MediaFile::sourcePath` in https://github.com/hydephp/develop/pull/1911
+  - Replaced method `Hyde::siteMediaPath` with `MediaFile::outputPath` in https://github.com/hydephp/develop/pull/1911
+  - We will now throw an exception if you try to get a media file that does not exist in order to prevent missing assets from going unnoticed in https://github.com/hydephp/develop/pull/1932
+- **MediaFile performance improvements:**
+  - Media assets are now cached in the HydeKernel, giving a massive performance boost and making it easier to access the instances in https://github.com/hydephp/develop/pull/1917
+  - Media file metadata is now lazy loaded and then cached in memory, providing performance improvements for files that may not be used in a build in https://github.com/hydephp/develop/pull/1933
+  - We now use the much faster `CRC32` hashing algoritm instead of `MD5` for cache busting keys in https://github.com/hydephp/develop/pull/1918
 
 ### Deprecated
 - for soon-to-be removed features.
@@ -72,6 +94,13 @@ This serves two purposes:
 - Removed: The deprecated `PostAuthor::getName()` method is now removed (use `$author->name`) in https://github.com/hydephp/develop/pull/1782
 - Internal: Removed the internal `DocumentationSearchPage::generate()` method as it was unused in https://github.com/hydephp/develop/pull/1569
 - Removed the deprecated `FeaturedImage::isRemote()` method in https://github.com/hydephp/develop/pull/1883. Use `Hyperlinks::isRemote()` instead.
+- **With the new Asset API, a few features had to be moved/removed:**
+  - `AssetService` class has been removed (was merged into the `Asset` facade) in https://github.com/hydephp/develop/pull/1908
+  - Removed HydeFront methods from the `Asset` facade (moved to the new HydeFront facade) in https://github.com/hydephp/develop/pull/1907
+  - The config options `hyde.hydefront_version` and `hyde.hydefront_cdn_url` have been removed in https://github.com/hydephp/develop/pull/1909 (as changing these could lead to incompatible asset versions, defeating the feature's purpose)
+  - Removed `Hyde::mediaLink()` method replaced by `Hyde::asset()` in https://github.com/hydephp/develop/pull/1932
+  - Removed `Hyde::mediaPath()` method replaced by `MediaFile::sourcePath()` in https://github.com/hydephp/develop/pull/1911
+  - Removed `Hyde::siteMediaPath()` method replaced by `MediaFile::outputPath()` in https://github.com/hydephp/develop/pull/1911
 
 ### Fixed
 - Added missing collection key types in Hyde facade method annotations in https://github.com/hydephp/develop/pull/1784
@@ -240,6 +269,53 @@ The following methods in the `Features` class have been renamed to follow a more
 
 Note that this class was previously marked as internal in v1, but the change is logged here in case it was used in configuration files or custom code.
 
+### Asset API Changes
+
+#### Overview
+For most end users, the changes to the Asset API in HydePHP 2.x will have minimal direct impact. However, if you have custom code that interacts with media files, you may need to update it.
+
+The most important thing to note is that all asset retrieval methods now return a `MediaFile` instance, which can be fluently interacted with, or cast to a string to get the link (which was the previous behavior).
+
+#### Side effects to consider
+
+Regardless of if you need to make changes to your code, there are a few side effects to consider:
+
+- All cache busting keys will have changed since we changed the hashing algorithm from `MD5` to `CRC32`.
+- Media file getters now return MediaFile instances instead of strings. But these can still be used the same way in Blade `{{ }}` tags, as they can be cast to strings.
+- Due to the internal normalizations, we will consistently use cache busting keys and use qualified paths when site URLs are set.
+- An exception will be thrown if you try to get a media file that does not exist in order to prevent missing assets from going unnoticed.
+
+These side effects should not have any negative impact on your site, but may cause the generated HTML to look slightly different.
+
+#### Impact on Your Code
+
+If you are using strict type declarations, you may need to update your code to expect a `MediaFile` instance instead of a string path; or you should cast the `MediaFile` instance to a string when needed.
+
+Most changes were made in https://github.com/hydephp/develop/pull/1904 which contains extra information and the reasoning behind the changes.
+
+#### Updating Your Code
+
+Once you have determined that you need to update your code, here are the steps you should take:
+
+1. Update calls to renamed methods:
+   ```php
+   // Replace this:                      With this:
+   Hyde::mediaLink('image.png')      =>  Hyde::asset('image.png');
+   Asset::mediaLink('image.png')     =>  Asset::get('image.png');
+   Asset::hasMediaFile('image.png')  =>  Asset::exists('image.png');
+   Asset::cdnLink('app.css')         =>  HydeFront::cdnLink('app.css');
+   Asset::injectTailwindConfig()     =>  HydeFront::injectTailwindConfig();
+   FeaturedImage::isRemote($source)  =>  Hyperlinks::isRemote($source);
+   ```
+
+2. Rename the option `hyde.enable_cache_busting` to `hyde.cache_busting` in your configuration file.
+
+3. Remove any references to `hyde.hydefront_version` and `hyde.hydefront_cdn_url` in your config files as these options have been removed.
+
+4. If you were using `AssetService` directly, refactor your code to use the new `Asset` facade, `MediaFile` class, or `HydeFront` facade as appropriate.
+
+These changes simplify the Asset API and provide more robust handling of media files. The new `MediaFile` class offers additional functionality for working with assets.
+
 ## Low impact
 
 ### Navigation internal changes
diff --git a/_ide_helper.php b/_ide_helper.php
index 228893b3169..a838afac059 100644
--- a/_ide_helper.php
+++ b/_ide_helper.php
@@ -33,7 +33,6 @@
 class Hyde extends \Hyde\Hyde {}
 class Site extends \Hyde\Facades\Site {}
 class Meta extends \Hyde\Facades\Meta {}
-/** @mixin \Hyde\Framework\Services\AssetService */
 class Asset extends \Hyde\Facades\Asset {}
 class Author extends \Hyde\Facades\Author {}
 class Features extends \Hyde\Facades\Features {}
diff --git a/app/config.php b/app/config.php
index 143a4a6dda4..aed2519bbce 100644
--- a/app/config.php
+++ b/app/config.php
@@ -94,6 +94,7 @@
         'Meta' => \Hyde\Facades\Meta::class,
         'Asset' => \Hyde\Facades\Asset::class,
         'Author' => \Hyde\Facades\Author::class,
+        'HydeFront' => \Hyde\Facades\HydeFront::class,
         'Features' => \Hyde\Facades\Features::class,
         'Config' => \Hyde\Facades\Config::class,
         'Filesystem' => \Hyde\Facades\Filesystem::class,
@@ -104,6 +105,7 @@
         'MarkdownPage' => \Hyde\Pages\MarkdownPage::class,
         'MarkdownPost' => \Hyde\Pages\MarkdownPost::class,
         'DocumentationPage' => \Hyde\Pages\DocumentationPage::class,
+        'MediaFile' => \Hyde\Support\Filesystem\MediaFile::class,
         'DataCollection' => \Hyde\Support\DataCollection::class,
         'Includes' => \Hyde\Support\Includes::class,
         'Feature' => \Hyde\Enums\Feature::class,
diff --git a/config/hyde.php b/config/hyde.php
index 67c1da3b43b..92163827958 100644
--- a/config/hyde.php
+++ b/config/hyde.php
@@ -355,18 +355,16 @@
     | Cache Busting
     |--------------------------------------------------------------------------
     |
-    | Any assets loaded using the Asset::mediaLink() helper will automatically
-    | have a cache busting query string appended to the URL. This is useful
+    | Any assets loaded using the Hyde Asset helpers will automatically have
+    | a "cache busting" query string appended to the URL. This is useful
     | when you want to force browsers to load a new version of an asset.
+    | All included Blade templates use this feature to load assets.
     |
-    | The mediaLink helper is used in the built-in views to load the
-    | default stylesheets and scripts, and thus use this feature.
-    |
-    | To disable cache busting, set this setting to false.
+    | To disable the cache busting, set this setting to false.
     |
     */
 
-    'enable_cache_busting' => true,
+    'cache_busting' => true,
 
     /*
     |--------------------------------------------------------------------------
@@ -470,11 +468,6 @@
     // Where should the build manifest be saved? (Relative to project root, for example _site/build-manifest.json)
     'build_manifest_path' => 'app/storage/framework/cache/build-manifest.json',
 
-    // Here you can specify HydeFront version and URL for when loading app.css from the CDN.
-    // Only change these if you know what you're doing as some versions may be incompatible with your Hyde version.
-    'hydefront_version' => \Hyde\Framework\Services\AssetService::HYDEFRONT_VERSION,
-    'hydefront_cdn_url' => \Hyde\Framework\Services\AssetService::HYDEFRONT_CDN_URL,
-
     // Should the theme toggle buttons be displayed in the layouts?
     'theme_toggle_buttons' => true,
 
diff --git a/docs/_data/partials/hyde-pages-api/hyde-kernel-filesystem-methods.md b/docs/_data/partials/hyde-pages-api/hyde-kernel-filesystem-methods.md
index bdbe12dd34d..fa76f9881e7 100644
--- a/docs/_data/partials/hyde-pages-api/hyde-kernel-filesystem-methods.md
+++ b/docs/_data/partials/hyde-pages-api/hyde-kernel-filesystem-methods.md
@@ -1,7 +1,7 @@
 <section id="hyde-kernel-filesystem-methods">
 
 <!-- Start generated docs for Hyde\Foundation\Concerns\ForwardsFilesystem -->
-<!-- Generated by HydePHP DocGen script at 2023-03-11 11:17:34 in 0.10ms -->
+<!-- Generated by HydePHP DocGen script at 2024-08-01 10:01:06 in 0.13ms -->
 
 #### `filesystem()`
 
@@ -27,14 +27,6 @@ No description provided.
 Hyde::vendorPath(string $path, string $package): string
 ```
 
-#### `mediaPath()`
-
-No description provided.
-
-```php
-Hyde::mediaPath(string $path): string
-```
-
 #### `sitePath()`
 
 No description provided.
@@ -43,28 +35,28 @@ No description provided.
 Hyde::sitePath(string $path): string
 ```
 
-#### `siteMediaPath()`
+#### `pathToAbsolute()`
 
 No description provided.
 
 ```php
-Hyde::siteMediaPath(string $path): string
+Hyde::pathToAbsolute(array|string $path): array|string
 ```
 
-#### `pathToAbsolute()`
+#### `pathToRelative()`
 
 No description provided.
 
 ```php
-Hyde::pathToAbsolute(array|string $path): array|string
+Hyde::pathToRelative(string $path): string
 ```
 
-#### `pathToRelative()`
+#### `assets()`
 
 No description provided.
 
 ```php
-Hyde::pathToRelative(string $path): string
+Hyde::assets(): \Illuminate\Support\Collection<string, \Hyde\Support\Filesystem\MediaFile>
 ```
 
 <!-- End generated docs for Hyde\Foundation\Concerns\ForwardsFilesystem -->
diff --git a/docs/_data/partials/hyde-pages-api/hyde-kernel-hyperlink-methods.md b/docs/_data/partials/hyde-pages-api/hyde-kernel-hyperlink-methods.md
index 1dceb9c542d..d3d7e31ab61 100644
--- a/docs/_data/partials/hyde-pages-api/hyde-kernel-hyperlink-methods.md
+++ b/docs/_data/partials/hyde-pages-api/hyde-kernel-hyperlink-methods.md
@@ -1,7 +1,7 @@
 <section id="hyde-kernel-hyperlink-methods">
 
 <!-- Start generated docs for Hyde\Foundation\Concerns\ForwardsHyperlinks -->
-<!-- Generated by HydePHP DocGen script at 2024-02-25 19:02:29 in 0.09ms -->
+<!-- Generated by HydePHP DocGen script at 2024-09-08 10:25:34 in 0.11ms -->
 
 #### `formatLink()`
 
@@ -19,22 +19,16 @@ No description provided.
 Hyde::relativeLink(string $destination): string
 ```
 
-#### `mediaLink()`
-
-No description provided.
-
-```php
-Hyde::mediaLink(string $destination, bool $validate): string
-```
-
 #### `asset()`
 
 No description provided.
 
 ```php
-Hyde::asset(string $name, bool $preferQualifiedUrl): string
+Hyde::asset(string $name): Hyde\Support\Filesystem\MediaFile
 ```
 
+- **Throws:** \Hyde\Framework\Exceptions\FileNotFoundException If the file does not exist in the `_media` source directory.
+
 #### `url()`
 
 No description provided.
diff --git a/docs/architecture-concepts/the-hydekernel.md b/docs/architecture-concepts/the-hydekernel.md
index 4921cb88a37..2c266bbecd3 100644
--- a/docs/architecture-concepts/the-hydekernel.md
+++ b/docs/architecture-concepts/the-hydekernel.md
@@ -189,7 +189,7 @@ Hyde::markdown(string $text, bool $normalizeIndentation): Illuminate\Support\Htm
 <section id="hyde-kernel-hyperlink-methods">
 
 <!-- Start generated docs for Hyde\Foundation\Concerns\ForwardsHyperlinks -->
-<!-- Generated by HydePHP DocGen script at 2024-02-25 19:02:29 in 0.09ms -->
+<!-- Generated by HydePHP DocGen script at 2024-09-08 10:25:34 in 0.11ms -->
 
 #### `formatLink()`
 
@@ -207,22 +207,16 @@ No description provided.
 Hyde::relativeLink(string $destination): string
 ```
 
-#### `mediaLink()`
-
-No description provided.
-
-```php
-Hyde::mediaLink(string $destination, bool $validate): string
-```
-
 #### `asset()`
 
 No description provided.
 
 ```php
-Hyde::asset(string $name, bool $preferQualifiedUrl): string
+Hyde::asset(string $name): Hyde\Support\Filesystem\MediaFile
 ```
 
+- **Throws:** \Hyde\Framework\Exceptions\FileNotFoundException If the file does not exist in the `_media` source directory.
+
 #### `url()`
 
 No description provided.
@@ -254,7 +248,7 @@ Hyde::hasSiteUrl(): bool
 <section id="hyde-kernel-filesystem-methods">
 
 <!-- Start generated docs for Hyde\Foundation\Concerns\ForwardsFilesystem -->
-<!-- Generated by HydePHP DocGen script at 2023-03-11 11:17:34 in 0.10ms -->
+<!-- Generated by HydePHP DocGen script at 2024-08-01 10:01:06 in 0.13ms -->
 
 #### `filesystem()`
 
@@ -280,14 +274,6 @@ No description provided.
 Hyde::vendorPath(string $path, string $package): string
 ```
 
-#### `mediaPath()`
-
-No description provided.
-
-```php
-Hyde::mediaPath(string $path): string
-```
-
 #### `sitePath()`
 
 No description provided.
@@ -296,28 +282,28 @@ No description provided.
 Hyde::sitePath(string $path): string
 ```
 
-#### `siteMediaPath()`
+#### `pathToAbsolute()`
 
 No description provided.
 
 ```php
-Hyde::siteMediaPath(string $path): string
+Hyde::pathToAbsolute(array|string $path): array|string
 ```
 
-#### `pathToAbsolute()`
+#### `pathToRelative()`
 
 No description provided.
 
 ```php
-Hyde::pathToAbsolute(array|string $path): array|string
+Hyde::pathToRelative(string $path): string
 ```
 
-#### `pathToRelative()`
+#### `assets()`
 
 No description provided.
 
 ```php
-Hyde::pathToRelative(string $path): string
+Hyde::assets(): \Illuminate\Support\Collection<string, \Hyde\Support\Filesystem\MediaFile>
 ```
 
 <!-- End generated docs for Hyde\Foundation\Concerns\ForwardsFilesystem -->
diff --git a/docs/digging-deeper/customization.md b/docs/digging-deeper/customization.md
index f9c7a0f5682..95965376d78 100644
--- a/docs/digging-deeper/customization.md
+++ b/docs/digging-deeper/customization.md
@@ -342,20 +342,6 @@ Specifies the path where the build manifest should be saved, relative to the pro
 'build_manifest_path' => 'app/storage/framework/cache/build-manifest.json',
 ```
 
-### `hydefront_version` and `hydefront_cdn_url`
-
-These options allow you to specify the HydeFront version and CDN URL when loading `app.css` from the CDN.
-
-Only change these if you know what you're doing as some versions may be incompatible with your Hyde version.
-
-```php
-// filepath config/hyde.php
-use \Hyde\Framework\Services\AssetService;
-
-'hydefront_version' => AssetService::HYDEFRONT_VERSION,
-'hydefront_cdn_url' => AssetService::HYDEFRONT_CDN_URL,
-```
-
 ### `theme_toggle_buttons`
 
 >info This feature was added in HydePHP v1.7.0
diff --git a/ide.json b/ide.json
index d7f11367c56..d1e896dac60 100644
--- a/ide.json
+++ b/ide.json
@@ -15,6 +15,35 @@
                 }
             ]
         },
+        {
+            "complete": "directoryFiles",
+            "options": {
+                "directory": "/_media"
+            },
+            "condition": [
+                {
+                    "methodNames": ["get", "exists"],
+                    "place": "parameter",
+                    "classFqn": ["\\Hyde\\Facades\\Asset"],
+                    "parameters": [1]
+                },
+                {
+                    "methodNames": ["__construct", "get", "make", "sourcePath", "outputPath"],
+                    "place": "parameter",
+                    "classFqn": ["Hyde\\Support\\Filesystem\\MediaFile"],
+                    "parameters": [1]
+                }, {
+                    "methodNames": ["asset"],
+                    "place": "parameter",
+                    "classFqn": ["Hyde\\Foundation\\HydeKernel", "\\Hyde\\Hyde", "Hyde"],
+                    "parameters": [1]
+                }, {
+                    "functionNames": ["asset"],
+                    "place": "parameter",
+                    "parameters": [1]
+                }
+            ]
+        },
         {
             "complete": "configKey",
             "condition": [
diff --git a/monorepo/docs/hydefront.md b/monorepo/docs/hydefront.md
index 377f920e6e0..cb7733eabcd 100644
--- a/monorepo/docs/hydefront.md
+++ b/monorepo/docs/hydefront.md
@@ -64,6 +64,6 @@ This will create commits in both the monorepo and submodule. Now follow the foll
 9. Update the monorepo to use the new version.
     - [ ] `npm update hydefront`
     - **Note:** On major/minor version bumps, **remember to update** the `package.json` in the `packages/hyde` directory to use the new version!
-    - **Note:** On major version bumps, **remember to update the HydeFront version in the Asset Service!**
+    - **Note:** On major version bumps, **remember to update the HydeFront version in the Asset Facade!**
 10. Amend the monorepo commit with the updated files (package-lock.json, _media/app.css, packages\hydefront, packages\hyde\package.json)
-    - [ ] `git add packages/hydefront && git add packages/hyde/package.json && git add package-lock.json && git add _media/app.css && git add packages/framework/src/Framework/Services/AssetService.php && git commit --amend --no-edit`
+    - [ ] `git add packages/hydefront && git add packages/hyde/package.json && git add package-lock.json && git add _media/app.css && git add packages/framework/src/Facades/Asset.php && git commit --amend --no-edit`
diff --git a/packages/framework/config/hyde.php b/packages/framework/config/hyde.php
index 67c1da3b43b..92163827958 100644
--- a/packages/framework/config/hyde.php
+++ b/packages/framework/config/hyde.php
@@ -355,18 +355,16 @@
     | Cache Busting
     |--------------------------------------------------------------------------
     |
-    | Any assets loaded using the Asset::mediaLink() helper will automatically
-    | have a cache busting query string appended to the URL. This is useful
+    | Any assets loaded using the Hyde Asset helpers will automatically have
+    | a "cache busting" query string appended to the URL. This is useful
     | when you want to force browsers to load a new version of an asset.
+    | All included Blade templates use this feature to load assets.
     |
-    | The mediaLink helper is used in the built-in views to load the
-    | default stylesheets and scripts, and thus use this feature.
-    |
-    | To disable cache busting, set this setting to false.
+    | To disable the cache busting, set this setting to false.
     |
     */
 
-    'enable_cache_busting' => true,
+    'cache_busting' => true,
 
     /*
     |--------------------------------------------------------------------------
@@ -470,11 +468,6 @@
     // Where should the build manifest be saved? (Relative to project root, for example _site/build-manifest.json)
     'build_manifest_path' => 'app/storage/framework/cache/build-manifest.json',
 
-    // Here you can specify HydeFront version and URL for when loading app.css from the CDN.
-    // Only change these if you know what you're doing as some versions may be incompatible with your Hyde version.
-    'hydefront_version' => \Hyde\Framework\Services\AssetService::HYDEFRONT_VERSION,
-    'hydefront_cdn_url' => \Hyde\Framework\Services\AssetService::HYDEFRONT_CDN_URL,
-
     // Should the theme toggle buttons be displayed in the layouts?
     'theme_toggle_buttons' => true,
 
diff --git a/packages/framework/resources/views/layouts/head.blade.php b/packages/framework/resources/views/layouts/head.blade.php
index 32ed4390d8b..861eadfc8ff 100644
--- a/packages/framework/resources/views/layouts/head.blade.php
+++ b/packages/framework/resources/views/layouts/head.blade.php
@@ -2,8 +2,8 @@
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <title>{{ $page->title() }}</title>
 
-@if (file_exists(Hyde::mediaPath('favicon.ico')))
-    <link rel="shortcut icon" href="{{ Hyde::relativeLink('media/favicon.ico') }}" type="image/x-icon">
+@if (Asset::exists('favicon.ico'))
+    <link rel="shortcut icon" href="{{ Asset::get('media/favicon.ico') }}" type="image/x-icon">
 @endif
 
 {{-- App Meta Tags --}}
diff --git a/packages/framework/resources/views/layouts/scripts.blade.php b/packages/framework/resources/views/layouts/scripts.blade.php
index bdb527f59bb..abc3a7030b5 100644
--- a/packages/framework/resources/views/layouts/scripts.blade.php
+++ b/packages/framework/resources/views/layouts/scripts.blade.php
@@ -1,6 +1,6 @@
 {{-- The compiled Laravel Mix scripts --}}
-@if(Asset::hasMediaFile('app.js'))
-    <script defer src="{{ Asset::mediaLink('app.js') }}"></script>
+@if(Asset::exists('app.js'))
+    <script defer src="{{ Asset::get('app.js') }}"></script>
 @endif
 
 {{-- Alpine.js --}}
diff --git a/packages/framework/resources/views/layouts/styles.blade.php b/packages/framework/resources/views/layouts/styles.blade.php
index 497e524ae1b..8bf4d5bcc55 100644
--- a/packages/framework/resources/views/layouts/styles.blade.php
+++ b/packages/framework/resources/views/layouts/styles.blade.php
@@ -3,15 +3,15 @@
 
 {{-- The compiled Tailwind/App styles --}}
 @if(config('hyde.load_app_styles_from_cdn', false))
-    <link rel="stylesheet" href="{{ Asset::cdnLink('app.css') }}">
-@elseif(Asset::hasMediaFile('app.css'))
-    <link rel="stylesheet" href="{{ Asset::mediaLink('app.css') }}">
+    <link rel="stylesheet" href="{{ HydeFront::cdnLink('app.css') }}">
+@elseif(Asset::exists('app.css'))
+    <link rel="stylesheet" href="{{ Asset::get('app.css') }}">
 @endif
 
 {{-- Dynamic TailwindCSS Play CDN --}}
 @if(config('hyde.use_play_cdn', false))
     <script src="https://cdn.tailwindcss.com?plugins=typography"></script>
-    <script>tailwind.config = { {!! Asset::injectTailwindConfig() !!} }</script>
+    <script>tailwind.config = { {!! HydeFront::injectTailwindConfig() !!} }</script>
     <script>console.warn('The HydePHP TailwindCSS Play CDN is enabled. This is for development purposes only and should not be used in production.', 'See https://hydephp.com/docs/1.x/managing-assets');</script>
 @endif
 
diff --git a/packages/framework/src/Facades/Asset.php b/packages/framework/src/Facades/Asset.php
index f0bd3b6c651..3bc01acfa1c 100644
--- a/packages/framework/src/Facades/Asset.php
+++ b/packages/framework/src/Facades/Asset.php
@@ -4,25 +4,30 @@
 
 namespace Hyde\Facades;
 
-use Hyde\Framework\Services\AssetService;
-use Illuminate\Support\Facades\Facade;
+use Hyde\Support\Filesystem\MediaFile;
 
 /**
- * Handles the retrieval of core asset files, either from the HydeFront CDN or from the local media folder.
+ * Simplified facade to interact with media files.
  *
- * @see \Hyde\Framework\Services\AssetService
- *
- * @method static string version()
- * @method static string cdnLink(string $file)
- * @method static string mediaLink(string $file)
- * @method static bool hasMediaFile(string $file)
- * @method static string injectTailwindConfig()
+ * @see \Hyde\Support\Filesystem\MediaFile
  */
-class Asset extends Facade
+class Asset
 {
-    /** @psalm-return AssetService::class */
-    protected static function getFacadeAccessor(): string
+    /**
+     * Get a MediaFile instance for the given filename in the media source directory.
+     *
+     * @throws \Hyde\Framework\Exceptions\FileNotFoundException If the file does not exist in the `_media` source directory.
+     */
+    public static function get(string $file): MediaFile
+    {
+        return MediaFile::get($file);
+    }
+
+    /**
+     * Check if a media file exists in the source directory.
+     */
+    public static function exists(string $file): bool
     {
-        return AssetService::class;
+        return Filesystem::exists(MediaFile::sourcePath($file));
     }
 }
diff --git a/packages/framework/src/Facades/Filesystem.php b/packages/framework/src/Facades/Filesystem.php
index fa0434212e1..6b8753a639b 100644
--- a/packages/framework/src/Facades/Filesystem.php
+++ b/packages/framework/src/Facades/Filesystem.php
@@ -129,6 +129,42 @@ public static function putContents(string $path, string $contents, bool $lock =
         return self::put(...func_get_args());
     }
 
+    /**
+     * Improved mime type detection for the given path that can be relative to the project root,
+     * or a remote URL where this will try to guess the mime type based on the file extension.
+     *
+     * @param  string  $path  The path to the file, relative to the project root or a remote URL.
+     */
+    public static function findMimeType(string $path): string
+    {
+        $extension = self::extension($path);
+
+        $lookup = [
+            'txt' => 'text/plain',
+            'md' => 'text/markdown',
+            'html' => 'text/html',
+            'css' => 'text/css',
+            'svg' => 'image/svg+xml',
+            'png' => 'image/png',
+            'jpg' => 'image/jpeg',
+            'jpeg' => 'image/jpeg',
+            'gif' => 'image/gif',
+            'json' => 'application/json',
+            'js' => 'application/javascript',
+            'xml' => 'application/xml',
+        ];
+
+        if (isset($lookup[$extension])) {
+            return $lookup[$extension];
+        }
+
+        if (extension_loaded('fileinfo') && self::exists($path)) {
+            return self::mimeType($path);
+        }
+
+        return 'text/plain';
+    }
+
     protected static function filesystem(): \Illuminate\Filesystem\Filesystem
     {
         return app(\Illuminate\Filesystem\Filesystem::class);
diff --git a/packages/framework/src/Facades/HydeFront.php b/packages/framework/src/Facades/HydeFront.php
new file mode 100644
index 00000000000..9f3c4135ff6
--- /dev/null
+++ b/packages/framework/src/Facades/HydeFront.php
@@ -0,0 +1,65 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Hyde\Facades;
+
+use Hyde\Hyde;
+use Illuminate\Support\Str;
+
+use function sprintf;
+
+/**
+ * HydeFront is the NPM package that bundles the default precompiled CSS and JavaScript assets for HydePHP.
+ *
+ * This facade makes it easy to access these assets from the HydeFront CDN, automatically getting the correct version.
+ */
+class HydeFront
+{
+    /** @var string The HydeFront SemVer tag to load. This constant is set to match the styles used for the installed framework version. */
+    protected const HYDEFRONT_VERSION = 'v3.4';
+
+    /** @var string The HydeFront CDN path pattern used to assemble CDN links. */
+    protected const HYDEFRONT_CDN_URL = 'https://cdn.jsdelivr.net/npm/hydefront@%s/dist/%s';
+
+    /**
+     * Get the current version of the HydeFront package.
+     *
+     * @return string {@see HYDEFRONT_VERSION}
+     */
+    public static function version(): string
+    {
+        return static::HYDEFRONT_VERSION;
+    }
+
+    /**
+     * Get the CDN link for a specific file.
+     *
+     * @param  'app.css'|'hyde.css'|'hyde.css.map'  $file
+     *
+     * @link https://cdn.jsdelivr.net/npm/hydefront@latest/dist/ for the available files.
+     */
+    public static function cdnLink(string $file): string
+    {
+        return sprintf(static::HYDEFRONT_CDN_URL, static::version(), $file);
+    }
+
+    /** This method is used to inject the project's Tailwind CSS configuration into the Play CDN integration so it can match the styles. */
+    public static function injectTailwindConfig(): string
+    {
+        if (! file_exists(Hyde::path('tailwind.config.js'))) {
+            return '';
+        }
+
+        $config = Str::between(file_get_contents(Hyde::path('tailwind.config.js')), '{', '}');
+
+        // Remove the plugins array, as it is not used in the frontend build.
+        if (str_contains($config, 'plugins: [')) {
+            $tokens = explode('plugins: [', $config, 2);
+            $tokens[1] = Str::after($tokens[1], ']');
+            $config = implode('', $tokens);
+        }
+
+        return preg_replace('/\s+/', ' ', "/* tailwind.config.js */ \n".rtrim($config, ",\n\r"));
+    }
+}
diff --git a/packages/framework/src/Foundation/Concerns/ForwardsFilesystem.php b/packages/framework/src/Foundation/Concerns/ForwardsFilesystem.php
index 88e8aba452b..b294170474f 100644
--- a/packages/framework/src/Foundation/Concerns/ForwardsFilesystem.php
+++ b/packages/framework/src/Foundation/Concerns/ForwardsFilesystem.php
@@ -5,6 +5,7 @@
 namespace Hyde\Foundation\Concerns;
 
 use Hyde\Foundation\Kernel\Filesystem;
+use Illuminate\Support\Collection;
 
 /**
  * @internal Single-use trait for the HydeKernel class.
@@ -28,21 +29,11 @@ public function vendorPath(string $path = '', string $package = 'framework'): st
         return $this->filesystem->vendorPath($path, $package);
     }
 
-    public function mediaPath(string $path = ''): string
-    {
-        return $this->filesystem->mediaPath($path);
-    }
-
     public function sitePath(string $path = ''): string
     {
         return $this->filesystem->sitePath($path);
     }
 
-    public function siteMediaPath(string $path = ''): string
-    {
-        return $this->filesystem->siteMediaPath($path);
-    }
-
     public function pathToAbsolute(string|array $path): string|array
     {
         return $this->filesystem->pathToAbsolute($path);
@@ -52,4 +43,10 @@ public function pathToRelative(string $path): string
     {
         return $this->filesystem->pathToRelative($path);
     }
+
+    /** @return \Illuminate\Support\Collection<string, \Hyde\Support\Filesystem\MediaFile> */
+    public function assets(): Collection
+    {
+        return $this->filesystem->assets();
+    }
 }
diff --git a/packages/framework/src/Foundation/Concerns/ForwardsHyperlinks.php b/packages/framework/src/Foundation/Concerns/ForwardsHyperlinks.php
index 7f5bef1d14e..9c7cd2aded7 100644
--- a/packages/framework/src/Foundation/Concerns/ForwardsHyperlinks.php
+++ b/packages/framework/src/Foundation/Concerns/ForwardsHyperlinks.php
@@ -5,7 +5,7 @@
 namespace Hyde\Foundation\Concerns;
 
 use Hyde\Support\Models\Route;
-use JetBrains\PhpStorm\Deprecated;
+use Hyde\Support\Filesystem\MediaFile;
 
 /**
  * @internal Single-use trait for the HydeKernel class.
@@ -24,20 +24,10 @@ public function relativeLink(string $destination): string
         return $this->hyperlinks->relativeLink($destination);
     }
 
-    /**
-     * @deprecated This method will be removed in v2.0. Please use `asset()` instead.
-     */
-    #[Deprecated(reason: 'Use `asset` method instead.', replacement: '%class%::asset(%parameter0%)')]
-    public function mediaLink(string $destination, bool $validate = false): string
+    /** @throws \Hyde\Framework\Exceptions\FileNotFoundException If the file does not exist in the `_media` source directory. */
+    public function asset(string $name): MediaFile
     {
-        trigger_deprecation('hyde/framework', '1.8.0', 'The %s() method is deprecated, use %s() instead.', __METHOD__, 'asset');
-
-        return $this->hyperlinks->mediaLink($destination, $validate);
-    }
-
-    public function asset(string $name, bool $preferQualifiedUrl = false): string
-    {
-        return $this->hyperlinks->asset($name, $preferQualifiedUrl);
+        return $this->hyperlinks->asset($name);
     }
 
     public function url(string $path = ''): string
diff --git a/packages/framework/src/Foundation/Concerns/HasMediaFiles.php b/packages/framework/src/Foundation/Concerns/HasMediaFiles.php
new file mode 100644
index 00000000000..5fb387be696
--- /dev/null
+++ b/packages/framework/src/Foundation/Concerns/HasMediaFiles.php
@@ -0,0 +1,57 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Hyde\Foundation\Concerns;
+
+use Hyde\Hyde;
+use Hyde\Facades\Config;
+use Hyde\Facades\Filesystem;
+use Hyde\Support\Filesystem\MediaFile;
+use Illuminate\Support\Collection;
+
+use function implode;
+use function collect;
+use function sprintf;
+
+/**
+ * @internal Single-use trait for the Filesystem class.
+ *
+ * @see \Hyde\Foundation\Kernel\Filesystem
+ */
+trait HasMediaFiles
+{
+    /** @var Collection<string, \Hyde\Support\Filesystem\MediaFile> The Collection keys are the filenames relative to the _media/ directory */
+    protected Collection $assets;
+
+    /**
+     * Get all media files in the project.
+     *
+     * @return Collection<string, \Hyde\Support\Filesystem\MediaFile>
+     */
+    public function assets(): Collection
+    {
+        return $this->assets ??= static::discoverMediaFiles();
+    }
+
+    protected static function discoverMediaFiles(): Collection
+    {
+        return collect(static::getMediaFiles())->mapWithKeys(function (string $path): array {
+            $file = MediaFile::make($path);
+
+            return [$file->getIdentifier() => $file];
+        });
+    }
+
+    protected static function getMediaFiles(): array
+    {
+        return Filesystem::glob(static::getMediaGlobPattern(), GLOB_BRACE) ?: [];
+    }
+
+    protected static function getMediaGlobPattern(): string
+    {
+        return sprintf(Hyde::getMediaDirectory().'/{*,**/*,**/*/*}.{%s}', implode(',',
+            Config::getArray('hyde.media_extensions', MediaFile::EXTENSIONS)
+        ));
+    }
+}
diff --git a/packages/framework/src/Foundation/Kernel/Filesystem.php b/packages/framework/src/Foundation/Kernel/Filesystem.php
index a8f36a32df1..345f6caa524 100644
--- a/packages/framework/src/Foundation/Kernel/Filesystem.php
+++ b/packages/framework/src/Foundation/Kernel/Filesystem.php
@@ -7,6 +7,7 @@
 use Hyde\Hyde;
 use Hyde\Foundation\HydeKernel;
 use Hyde\Foundation\PharSupport;
+use Hyde\Foundation\Concerns\HasMediaFiles;
 use Illuminate\Support\Collection;
 
 use function collect;
@@ -29,6 +30,8 @@
  */
 class Filesystem
 {
+    use HasMediaFiles;
+
     protected HydeKernel $kernel;
 
     public function __construct(HydeKernel $kernel)
@@ -91,18 +94,6 @@ public function pathToRelative(string $path): string
             : $path);
     }
 
-    /**
-     * Get the absolute path to the media source directory, or a file within it.
-     */
-    public function mediaPath(string $path = ''): string
-    {
-        if (empty($path)) {
-            return $this->path(Hyde::getMediaDirectory());
-        }
-
-        return $this->path(path_join(Hyde::getMediaDirectory(), unslash($path)));
-    }
-
     /**
      * Get the absolute path to the compiled site directory, or a file within it.
      */
@@ -115,20 +106,6 @@ public function sitePath(string $path = ''): string
         return $this->path(path_join(Hyde::getOutputDirectory(), unslash($path)));
     }
 
-    /**
-     * Get the absolute path to the compiled site's media directory, or a file within it.
-     */
-    public function siteMediaPath(string $path = ''): string
-    {
-        if (empty($path)) {
-            return $this->sitePath(Hyde::getMediaOutputDirectory());
-        }
-
-        $path = unslash($path);
-
-        return $this->sitePath(Hyde::getMediaOutputDirectory()."/$path");
-    }
-
     /**
      * Works similarly to the path() function, but returns a file in the Framework package.
      *
diff --git a/packages/framework/src/Foundation/Kernel/Hyperlinks.php b/packages/framework/src/Foundation/Kernel/Hyperlinks.php
index e127cdfaa82..c23498ebae3 100644
--- a/packages/framework/src/Foundation/Kernel/Hyperlinks.php
+++ b/packages/framework/src/Foundation/Kernel/Hyperlinks.php
@@ -8,13 +8,11 @@
 use BadMethodCallException;
 use Hyde\Support\Models\Route;
 use Hyde\Foundation\HydeKernel;
-use Hyde\Framework\Exceptions\FileNotFoundException;
-use Illuminate\Support\Str;
+use Hyde\Support\Filesystem\MediaFile;
 
 use function str_ends_with;
 use function str_starts_with;
 use function substr_count;
-use function file_exists;
 use function str_replace;
 use function str_repeat;
 use function substr;
@@ -88,40 +86,17 @@ public function relativeLink(string $destination): string
     }
 
     /**
-     * Gets a relative web link to the given file stored in the _site/media folder.
+     * Gets a MediaAsset instance for the given file stored in the `_site/media` folder.
+     * The returned value can be cast into a string in Blade views to resole the URL.
      *
-     * An exception will be thrown if the file does not exist in the _media directory,
-     * and the second argument is set to true.
-     */
-    public function mediaLink(string $destination, bool $validate = false): string
-    {
-        if ($validate && ! file_exists($sourcePath = "{$this->kernel->getMediaDirectory()}/$destination")) {
-            throw new FileNotFoundException($sourcePath);
-        }
-
-        return $this->relativeLink("{$this->kernel->getMediaOutputDirectory()}/$destination");
-    }
-
-    /**
-     * Gets a relative web link to the given image stored in the _site/media folder.
-     * If the image is remote (starts with http) it will be returned as is.
+     * If a base URL is configured, the image will be returned with a qualified absolute URL.
+     * Otherwise, a relative path will be returned based on the rendered page's location.
      *
-     * If true is passed as the second argument, and a base URL is set,
-     * the image will be returned with a qualified absolute URL.
+     * @throws \Hyde\Framework\Exceptions\FileNotFoundException If the file does not exist in the `_media` source directory.
      */
-    public function asset(string $name, bool $preferQualifiedUrl = false): string
+    public function asset(string $name): MediaFile
     {
-        if (static::isRemote($name)) {
-            return $name;
-        }
-
-        $name = Str::start($name, "{$this->kernel->getMediaOutputDirectory()}/");
-
-        if ($preferQualifiedUrl && $this->hasSiteUrl()) {
-            return $this->url($name);
-        }
-
-        return $this->relativeLink($name);
+        return MediaFile::get($name);
     }
 
     /**
diff --git a/packages/framework/src/Framework/Actions/PreBuildTasks/CleanSiteDirectory.php b/packages/framework/src/Framework/Actions/PreBuildTasks/CleanSiteDirectory.php
index 849f077b7cb..ba64f24ee76 100644
--- a/packages/framework/src/Framework/Actions/PreBuildTasks/CleanSiteDirectory.php
+++ b/packages/framework/src/Framework/Actions/PreBuildTasks/CleanSiteDirectory.php
@@ -7,6 +7,7 @@
 use Hyde\Hyde;
 use Hyde\Facades\Config;
 use Hyde\Facades\Filesystem;
+use Hyde\Support\Filesystem\MediaFile;
 use Hyde\Framework\Features\BuildTasks\PreBuildTask;
 
 use function basename;
@@ -22,7 +23,7 @@ public function handle(): void
     {
         if ($this->isItSafeToCleanOutputDirectory()) {
             Filesystem::unlink(glob(Hyde::sitePath('*.{html,json}'), GLOB_BRACE));
-            Filesystem::cleanDirectory(Hyde::siteMediaPath());
+            Filesystem::cleanDirectory(MediaFile::outputPath());
         }
     }
 
diff --git a/packages/framework/src/Framework/Actions/PreBuildTasks/TransferMediaAssets.php b/packages/framework/src/Framework/Actions/PreBuildTasks/TransferMediaAssets.php
index fdec03a75ff..05dda5e7c00 100644
--- a/packages/framework/src/Framework/Actions/PreBuildTasks/TransferMediaAssets.php
+++ b/packages/framework/src/Framework/Actions/PreBuildTasks/TransferMediaAssets.php
@@ -4,7 +4,7 @@
 
 namespace Hyde\Framework\Actions\PreBuildTasks;
 
-use Hyde\Hyde;
+use Hyde\Facades\Filesystem;
 use Hyde\Support\Filesystem\MediaFile;
 use Hyde\Framework\Features\BuildTasks\PreBuildTask;
 use Hyde\Framework\Concerns\InteractsWithDirectories;
@@ -17,14 +17,16 @@ class TransferMediaAssets extends PreBuildTask
 
     public function handle(): void
     {
-        $this->needsDirectory(Hyde::siteMediaPath());
-
         $this->newLine();
 
-        $this->withProgressBar(MediaFile::files(), function (string $identifier): void {
-            $sitePath = Hyde::siteMediaPath($identifier);
+        if (MediaFile::all()->isEmpty()) {
+            $this->skip("No media files to transfer.\n");
+        }
+
+        $this->withProgressBar(MediaFile::all(), function (MediaFile $file): void {
+            $sitePath = $file->getOutputPath();
             $this->needsParentDirectory($sitePath);
-            copy(Hyde::mediaPath($identifier), $sitePath);
+            Filesystem::putContents($sitePath, $file->getContents());
         });
 
         $this->newLine();
diff --git a/packages/framework/src/Framework/Features/Blogging/Models/FeaturedImage.php b/packages/framework/src/Framework/Features/Blogging/Models/FeaturedImage.php
index 0f42f961c87..e1cb2d34ea6 100644
--- a/packages/framework/src/Framework/Features/Blogging/Models/FeaturedImage.php
+++ b/packages/framework/src/Framework/Features/Blogging/Models/FeaturedImage.php
@@ -11,14 +11,11 @@
 use Hyde\Support\BuildWarnings;
 use Illuminate\Support\Facades\Http;
 use Hyde\Foundation\Kernel\Hyperlinks;
-use Hyde\Framework\Exceptions\FileNotFoundException;
+use Hyde\Support\Filesystem\MediaFile;
 use Hyde\Markdown\Contracts\FrontMatter\SubSchemas\FeaturedImageSchema;
 
 use function array_key_exists;
 use function array_flip;
-use function file_exists;
-use function filesize;
-use function sprintf;
 use function key;
 
 /**
@@ -82,7 +79,7 @@ public function getSource(): string
     {
         if ($this->type === self::TYPE_LOCAL) {
             // Return value is always resolvable from a compiled page in the _site directory.
-            return Hyde::mediaLink($this->source);
+            return (string) Hyde::asset($this->source);
         }
 
         return $this->source;
@@ -213,13 +210,7 @@ protected function has(string $property): bool
 
     protected function getContentLengthForLocalImage(): int
     {
-        $storagePath = Hyde::mediaPath($this->source);
-
-        if (! file_exists($storagePath)) {
-            throw new FileNotFoundException(customMessage: sprintf('Featured image [%s] not found.', Hyde::pathToRelative($storagePath)));
-        }
-
-        return filesize($storagePath);
+        return MediaFile::get($this->source)->getLength();
     }
 
     protected function getContentLengthForRemoteImage(): int
diff --git a/packages/framework/src/Framework/Features/XmlGenerators/RssFeedGenerator.php b/packages/framework/src/Framework/Features/XmlGenerators/RssFeedGenerator.php
index b3abfab48d2..c8d6a3340c9 100644
--- a/packages/framework/src/Framework/Features/XmlGenerators/RssFeedGenerator.php
+++ b/packages/framework/src/Framework/Features/XmlGenerators/RssFeedGenerator.php
@@ -12,7 +12,7 @@
 use Hyde\Facades\Site;
 use Hyde\Facades\Config;
 use Hyde\Pages\MarkdownPost;
-use Hyde\Support\Filesystem\MediaFile;
+use Hyde\Facades\Filesystem;
 use Hyde\Framework\Features\Blogging\Models\FeaturedImage;
 
 use function date;
@@ -108,7 +108,7 @@ protected function addAtomLinkItem(): void
 
     protected function getImageType(FeaturedImage $image): string
     {
-        return (new MediaFile($image->getSource()))->getMimeType();
+        return Filesystem::findMimeType($image->getSource());
     }
 
     /** @return numeric-string */
diff --git a/packages/framework/src/Framework/HydeServiceProvider.php b/packages/framework/src/Framework/HydeServiceProvider.php
index df67c1785df..471d3d32aa2 100644
--- a/packages/framework/src/Framework/HydeServiceProvider.php
+++ b/packages/framework/src/Framework/HydeServiceProvider.php
@@ -10,7 +10,6 @@
 use Hyde\Pages\MarkdownPost;
 use Hyde\Foundation\HydeKernel;
 use Hyde\Pages\DocumentationPage;
-use Hyde\Framework\Services\AssetService;
 use Hyde\Framework\Services\MarkdownService;
 use Hyde\Framework\Services\BuildTaskService;
 use Hyde\Framework\Concerns\RegistersFileLocations;
@@ -30,7 +29,6 @@ public function register(): void
     {
         $this->kernel = HydeKernel::getInstance();
 
-        $this->app->singleton(AssetService::class, AssetService::class);
         $this->app->singleton(BuildTaskService::class, BuildTaskService::class);
         $this->app->bind(MarkdownService::class, MarkdownService::class);
 
diff --git a/packages/framework/src/Framework/Services/AssetService.php b/packages/framework/src/Framework/Services/AssetService.php
deleted file mode 100644
index 9373b676e10..00000000000
--- a/packages/framework/src/Framework/Services/AssetService.php
+++ /dev/null
@@ -1,100 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Hyde\Framework\Services;
-
-use Hyde\Hyde;
-use Hyde\Facades\Config;
-use Illuminate\Support\Str;
-
-use function rtrim;
-use function explode;
-use function implode;
-use function md5_file;
-use function file_exists;
-use function str_replace;
-use function preg_replace;
-use function str_contains;
-use function file_get_contents;
-
-/**
- * Handles the retrieval of core asset files. Commonly used through the Asset facade.
- *
- * This class is loaded into the service container, making it easy to access and modify.
- *
- * The class also provides helper methods for interacting with versioned files,
- * as well as the HydeFront CDN service and the media directories.
- *
- * @see \Hyde\Facades\Asset
- */
-class AssetService
-{
-    /** @var string The default HydeFront SemVer tag to load. This constant is set to match the styles used for the installed framework version. */
-    final public const HYDEFRONT_VERSION = 'v3.4';
-
-    /** @var string The default HydeFront CDN path pattern. The Blade-style placeholders are replaced with the proper values. */
-    final public const HYDEFRONT_CDN_URL = 'https://cdn.jsdelivr.net/npm/hydefront@{{ $version }}/dist/{{ $file }}';
-
-    protected string $version = self::HYDEFRONT_VERSION;
-    protected string $cdnUrl = self::HYDEFRONT_CDN_URL;
-
-    public function __construct()
-    {
-        $this->version = Config::getString('hyde.hydefront_version', self::HYDEFRONT_VERSION);
-        $this->cdnUrl = Config::getString('hyde.hydefront_url', self::HYDEFRONT_CDN_URL);
-    }
-
-    public function version(): string
-    {
-        return $this->version;
-    }
-
-    public function cdnLink(string $file): string
-    {
-        return $this->constructCdnPath($file);
-    }
-
-    public function mediaLink(string $file): string
-    {
-        return Hyde::mediaLink($file).$this->getCacheBustKey($file);
-    }
-
-    public function hasMediaFile(string $file): bool
-    {
-        return file_exists(Hyde::mediaPath($file));
-    }
-
-    public function injectTailwindConfig(): string
-    {
-        if (! file_exists(Hyde::path('tailwind.config.js'))) {
-            return '';
-        }
-
-        $config = Str::between(file_get_contents(Hyde::path('tailwind.config.js')), '{', '}');
-
-        // Remove the plugins array, as it is not used in the frontend.
-        if (str_contains($config, 'plugins: [')) {
-            $tokens = explode('plugins: [', $config, 2);
-            $tokens[1] = Str::after($tokens[1], ']');
-            $config = implode('', $tokens);
-        }
-
-        return preg_replace('/\s+/', ' ', "/* tailwind.config.js */ \n".rtrim($config, ",\n\r"));
-    }
-
-    protected function constructCdnPath(string $file): string
-    {
-        return str_replace(
-            ['{{ $version }}', '{{ $file }}'], [$this->version(), $file],
-            $this->cdnUrl
-        );
-    }
-
-    protected function getCacheBustKey(string $file): string
-    {
-        return Config::getBool('hyde.enable_cache_busting', true)
-            ? '?v='.md5_file(Hyde::mediaPath("$file"))
-            : '';
-    }
-}
diff --git a/packages/framework/src/Framework/Services/ValidationService.php b/packages/framework/src/Framework/Services/ValidationService.php
index 88deee3496b..052486d4041 100644
--- a/packages/framework/src/Framework/Services/ValidationService.php
+++ b/packages/framework/src/Framework/Services/ValidationService.php
@@ -11,6 +11,7 @@
 use Hyde\Pages\MarkdownPage;
 use Hyde\Pages\DocumentationPage;
 use Hyde\Enums\Feature;
+use Hyde\Support\Filesystem\MediaFile;
 use Hyde\Support\Models\ValidationResult as Result;
 
 use function count;
@@ -102,12 +103,12 @@ public function check_documentation_site_has_an_index_page(Result $result): Resu
 
     public function check_site_has_an_app_css_stylesheet(Result $result): Result
     {
-        if (file_exists(Hyde::siteMediaPath('/app.css')) || file_exists(Hyde::mediaPath('app.css'))) {
+        if (file_exists(MediaFile::outputPath('/app.css')) || file_exists(MediaFile::sourcePath('app.css'))) {
             return $result->pass('Your site has an app.css stylesheet');
         }
 
         return $result->fail(sprintf('Could not find an app.css file in the %s or %s directory!',
-            Hyde::pathToRelative(Hyde::siteMediaPath()), Hyde::getMediaDirectory()
+            Hyde::pathToRelative(MediaFile::outputPath()), Hyde::getMediaDirectory()
         ))->withTip('You may need to run `npm run dev`.`');
     }
 
diff --git a/packages/framework/src/Markdown/Processing/DynamicMarkdownLinkProcessor.php b/packages/framework/src/Markdown/Processing/DynamicMarkdownLinkProcessor.php
index 7dc220855e0..c14732b2e09 100644
--- a/packages/framework/src/Markdown/Processing/DynamicMarkdownLinkProcessor.php
+++ b/packages/framework/src/Markdown/Processing/DynamicMarkdownLinkProcessor.php
@@ -66,7 +66,7 @@ protected static function assetMap(): array
 
     protected static function assetPath(MediaFile $mediaFile): string
     {
-        return Hyde::asset(Str::after($mediaFile->getPath(), '_media/'));
+        return Hyde::asset(Str::after($mediaFile->getPath(), '_media/'))->getLink();
     }
 
     /** @internal Testing helper to reset the asset map cache. */
diff --git a/packages/framework/src/Support/Filesystem/MediaFile.php b/packages/framework/src/Support/Filesystem/MediaFile.php
index 45298a50694..82eadc79b9b 100644
--- a/packages/framework/src/Support/Filesystem/MediaFile.php
+++ b/packages/framework/src/Support/Filesystem/MediaFile.php
@@ -5,114 +5,244 @@
 namespace Hyde\Support\Filesystem;
 
 use Hyde\Hyde;
+use Stringable;
 use Hyde\Facades\Config;
+use Hyde\Facades\Filesystem;
+use Illuminate\Support\Collection;
 use Hyde\Framework\Exceptions\FileNotFoundException;
 use Illuminate\Support\Str;
 
-use function extension_loaded;
-use function file_exists;
+use function Hyde\unslash;
+use function Hyde\path_join;
+use function Hyde\trim_slashes;
 use function array_merge;
-use function array_keys;
-use function filesize;
-use function implode;
-use function pathinfo;
-use function collect;
-use function is_file;
-use function sprintf;
-use function glob;
 
 /**
  * File abstraction for a project media file.
+ *
+ * All input paths are relative to the project's media source directory.
  */
-class MediaFile extends ProjectFile
+class MediaFile extends ProjectFile implements Stringable
 {
     /** @var array<string> The default extensions for media types */
     final public const EXTENSIONS = ['png', 'svg', 'jpg', 'jpeg', 'gif', 'ico', 'css', 'js'];
 
-    /** @return array<string, \Hyde\Support\Filesystem\MediaFile> The array keys are the filenames relative to the _media/ directory */
-    public static function all(): array
+    protected readonly int $length;
+    protected readonly string $mimeType;
+    protected readonly string $hash;
+
+    /**
+     * Create a new MediaFile instance.
+     *
+     * @param  string  $path  The file path relative to the project root or media source directory.
+     *
+     * @throws \Hyde\Framework\Exceptions\FileNotFoundException If the file does not exist in the media source directory.
+     */
+    public function __construct(string $path)
     {
-        return static::discoverMediaAssetFiles();
+        parent::__construct($this->getNormalizedPath($path));
     }
 
-    /** @return array<string> Array of filenames relative to the _media/ directory */
+    /**
+     * Cast the instance to a string which is the resolved web link to the media file.
+     */
+    public function __toString(): string
+    {
+        return $this->getLink();
+    }
+
+    /**
+     * Create a media file instance for the given file.
+     */
+    public static function make(string $path): static
+    {
+        return parent::make($path);
+    }
+
+    /**
+     * Get or create a media file instance from the HydeKernel for the given file.
+     *
+     * @throws \Hyde\Framework\Exceptions\FileNotFoundException If the file does not exist in the `_media` source directory.
+     */
+    public static function get(string $path): MediaFile
+    {
+        return Hyde::assets()->get($path) ?? static::make($path);
+    }
+
+    /**
+     * Get a collection of all media files, parsed into `MediaFile` instances, keyed by the filenames relative to the `_media/` directory.
+     *
+     * @return \Illuminate\Support\Collection<string, \Hyde\Support\Filesystem\MediaFile>
+     */
+    public static function all(): Collection
+    {
+        return Hyde::assets();
+    }
+
+    /**
+     * Get an array of media asset filenames relative to the `_media/` directory.
+     *
+     * @return array<int, string> {@example `['app.css', 'images/logo.svg']`}
+     */
     public static function files(): array
     {
-        return array_keys(static::all());
+        return static::all()->keys()->all();
+    }
+
+    /**
+     * Get the absolute path to the media source directory, or a file within it.
+     */
+    public static function sourcePath(string $path = ''): string
+    {
+        if (empty($path)) {
+            return Hyde::path(Hyde::getMediaDirectory());
+        }
+
+        return Hyde::path(path_join(Hyde::getMediaDirectory(), unslash($path)));
+    }
+
+    /**
+     * Get the absolute path to the compiled site's media directory, or a file within it.
+     */
+    public static function outputPath(string $path = ''): string
+    {
+        if (empty($path)) {
+            return Hyde::sitePath(Hyde::getMediaOutputDirectory());
+        }
+
+        return Hyde::sitePath(path_join(Hyde::getMediaOutputDirectory(), unslash($path)));
     }
 
+    /**
+     * Get the path to the media file relative to the media directory.
+     */
     public function getIdentifier(): string
     {
         return Str::after($this->getPath(), Hyde::getMediaDirectory().'/');
     }
 
+    /**
+     * Get a relative web link to the media file.
+     */
+    public function getLink(): string
+    {
+        $name = $this->getIdentifier();
+
+        $name = Str::start($name, Hyde::getMediaOutputDirectory().'/');
+
+        if (Hyde::hasSiteUrl()) {
+            return Hyde::url($name).$this->getCacheBustKey();
+        }
+
+        return Hyde::relativeLink($name).$this->getCacheBustKey();
+    }
+
+    /**
+     * Get the absolute path to the media file in the compiled site.
+     */
+    public function getOutputPath(): string
+    {
+        return static::outputPath($this->getIdentifier());
+    }
+
+    /**
+     * Get the content length of the file in bytes.
+     */
+    public function getLength(): int
+    {
+        $this->ensureInstanceIsBooted('length');
+
+        return $this->length;
+    }
+
+    /**
+     * Get the MIME type of the file.
+     */
+    public function getMimeType(): string
+    {
+        $this->ensureInstanceIsBooted('mimeType');
+
+        return $this->mimeType;
+    }
+
+    /**
+     * Get the CRC32 hash of the file.
+     */
+    public function getHash(): string
+    {
+        $this->ensureInstanceIsBooted('hash');
+
+        return $this->hash;
+    }
+
+    /**
+     * Get the file information as an array.
+     *
+     * @return array{name: string, path: string, length: int, mimeType: string, hash: string}
+     */
     public function toArray(): array
     {
         return array_merge(parent::toArray(), [
-            'length' => $this->getContentLength(),
+            'length' => $this->getLength(),
             'mimeType' => $this->getMimeType(),
+            'hash' => $this->getHash(),
         ]);
     }
 
-    public function getContentLength(): int
+    protected function getCacheBustKey(): string
     {
-        if (! is_file($this->getAbsolutePath())) {
-            throw new FileNotFoundException($this->path);
-        }
-
-        return filesize($this->getAbsolutePath());
+        return Config::getBool('hyde.cache_busting', true)
+            ? '?v='.$this->getHash()
+            : '';
     }
 
-    public function getMimeType(): string
+    protected function getNormalizedPath(string $path): string
     {
-        $extension = pathinfo($this->getAbsolutePath(), PATHINFO_EXTENSION);
-
-        // See if we can find a mime type for the extension instead of
-        // having to rely on a PHP extension and filesystem lookups.
-        $lookup = [
-            'txt' => 'text/plain',
-            'md' => 'text/markdown',
-            'html' => 'text/html',
-            'css' => 'text/css',
-            'svg' => 'image/svg+xml',
-            'png' => 'image/png',
-            'jpg' => 'image/jpeg',
-            'jpeg' => 'image/jpeg',
-            'gif' => 'image/gif',
-            'json' => 'application/json',
-            'js' => 'application/javascript',
-            'xml' => 'application/xml',
-        ];
-
-        if (isset($lookup[$extension])) {
-            return $lookup[$extension];
+        // Ensure we are working with a relative project path
+        $path = Hyde::pathToRelative($path);
+
+        // Normalize paths using output directory to have source directory prefix
+        if (str_starts_with($path, Hyde::getMediaOutputDirectory()) && str_starts_with(Hyde::getMediaDirectory(), '_')) {
+            $path = '_'.$path;
         }
 
-        if (extension_loaded('fileinfo') && file_exists($this->getAbsolutePath())) {
-            return mime_content_type($this->getAbsolutePath());
+        // Normalize the path to include the media directory
+        $path = static::sourcePath(trim_slashes(Str::after($path, Hyde::getMediaDirectory())));
+
+        // Since assets need to exist on disk in order to be copied to the built site files we validate that the file is real here.
+        if (Filesystem::missing($path)) {
+            throw new FileNotFoundException($path, appendAfterPath: ' when trying to resolve a media asset.');
         }
 
-        return 'text/plain';
+        return $path;
     }
 
-    protected static function discoverMediaAssetFiles(): array
+    protected function findLength(): int
     {
-        return collect(static::getMediaAssetFiles())->mapWithKeys(function (string $path): array {
-            $file = static::make($path);
+        return Filesystem::size($this->getPath());
+    }
 
-            return [$file->getIdentifier() => $file];
-        })->all();
+    protected function findMimeType(): string
+    {
+        return Filesystem::findMimeType($this->getPath());
     }
 
-    protected static function getMediaAssetFiles(): array
+    protected function findHash(): string
     {
-        return glob(Hyde::path(static::getMediaGlobPattern()), GLOB_BRACE) ?: [];
+        return Filesystem::hash($this->getPath(), 'crc32');
+    }
+
+    protected function ensureInstanceIsBooted(string $property): void
+    {
+        if (! isset($this->$property)) {
+            $this->boot();
+        }
     }
 
-    protected static function getMediaGlobPattern(): string
+    protected function boot(): void
     {
-        return sprintf(Hyde::getMediaDirectory().'/{*,**/*,**/*/*}.{%s}', implode(',',
-            Config::getArray('hyde.media_extensions', self::EXTENSIONS)
-        ));
+        $this->length = $this->findLength();
+        $this->mimeType = $this->findMimeType();
+        $this->hash = $this->findHash();
     }
 }
diff --git a/packages/framework/src/Support/Filesystem/ProjectFile.php b/packages/framework/src/Support/Filesystem/ProjectFile.php
index eb29ba893e9..36376fbc14c 100644
--- a/packages/framework/src/Support/Filesystem/ProjectFile.php
+++ b/packages/framework/src/Support/Filesystem/ProjectFile.php
@@ -11,8 +11,6 @@
 use Hyde\Support\Concerns\Serializable;
 use Hyde\Support\Contracts\SerializableContract;
 
-use function pathinfo;
-
 /**
  * Filesystem abstraction for a file stored in the project.
  */
@@ -71,6 +69,6 @@ public function getContents(): string
 
     public function getExtension(): string
     {
-        return pathinfo($this->getAbsolutePath(), PATHINFO_EXTENSION);
+        return Filesystem::extension($this->getPath());
     }
 }
diff --git a/packages/framework/src/helpers.php b/packages/framework/src/helpers.php
index c94494c5f7f..ddc0bf27f48 100644
--- a/packages/framework/src/helpers.php
+++ b/packages/framework/src/helpers.php
@@ -4,6 +4,7 @@
 
 namespace {
     use Hyde\Foundation\HydeKernel;
+    use Hyde\Support\Filesystem\MediaFile;
 
     if (! function_exists('hyde')) {
         /**
@@ -20,11 +21,17 @@ function hyde(): HydeKernel
     } else {
         if (! function_exists('asset')) {
             /**
-             * Get a relative link or URL to an asset in the media directory.
+             * Gets a MediaAsset instance for the given file stored in the `_site/media` folder.
+             * The returned value can be cast into a string in Blade views to resole the URL.
+             *
+             * If a base URL is configured, the image will be returned with a qualified absolute URL.
+             * Otherwise, a relative path will be returned based on the rendered page's location.
+             *
+             * @throws \Hyde\Framework\Exceptions\FileNotFoundException If the file does not exist in the `_media` source directory.
              */
-            function asset(string $name, bool $preferQualifiedUrl = false): string
+            function asset(string $name): MediaFile
             {
-                return hyde()->asset($name, $preferQualifiedUrl);
+                return hyde()->asset($name);
             }
         }
 
diff --git a/packages/framework/tests/Feature/AssetAPIFeatureTest.php b/packages/framework/tests/Feature/AssetAPIFeatureTest.php
new file mode 100644
index 00000000000..c80f9a75814
--- /dev/null
+++ b/packages/framework/tests/Feature/AssetAPIFeatureTest.php
@@ -0,0 +1,146 @@
+<?php
+
+declare(strict_types=1);
+
+use Hyde\Hyde;
+use Hyde\Facades\Asset;
+use Hyde\Testing\TestCase;
+use Hyde\Foundation\HydeKernel;
+use Illuminate\Support\Facades\Blade;
+use Hyde\Support\Filesystem\MediaFile;
+use Hyde\Framework\Exceptions\FileNotFoundException;
+
+/**
+ * High level test for the Asset API.
+ *
+ * @covers \Hyde\Facades\Asset
+ * @covers \Hyde\Support\Filesystem\MediaFile
+ * @covers \Hyde\Foundation\Kernel\Hyperlinks
+ */
+class AssetAPIFeatureTest extends TestCase
+{
+    public function testAssetAPIExamples()
+    {
+        // Tests for the Asset API, can be used to try out the PhpStorm autocompletion
+
+        $conditions = [
+            'existsTrue' => \Hyde\Facades\Asset::exists('app.css'),
+            'existsFalse' => \Hyde\Facades\Asset::exists('missing.png'),
+            'getters' => [
+                (string) \Hyde\Facades\Asset::get('app.css'),
+                \Hyde\Facades\Asset::get('app.css'),
+                \Hyde::asset('app.css'),
+                \Hyde\Hyde::asset('app.css'),
+                Hyde::kernel()->asset('app.css'),
+                HydeKernel::getInstance()->asset('app.css'),
+                hyde()->asset('app.css'),
+                asset('app.css'),
+            ],
+            'accessors' => [
+                new MediaFile('app.css'),
+                MediaFile::make('app.css'),
+                MediaFile::get('app.css'),
+                MediaFile::sourcePath('app.css'),
+                MediaFile::outputPath('app.css'),
+            ],
+        ];
+
+        $this->assertEquals([
+            'existsTrue' => true,
+            'existsFalse' => false,
+            'getters' => [
+                "media/app.css?v={$this->getAppStylesVersion()}",
+                MediaFile::get('app.css'),
+                MediaFile::get('app.css'),
+                MediaFile::get('app.css'),
+                MediaFile::get('app.css'),
+                MediaFile::get('app.css'),
+                MediaFile::get('app.css'),
+                MediaFile::get('app.css'),
+            ],
+            'accessors' => [
+                new MediaFile('app.css'),
+                new MediaFile('app.css'),
+                MediaFile::get('app.css'),
+                Hyde::path('_media/app.css'),
+                Hyde::sitePath('media/app.css'),
+            ],
+        ], $conditions);
+    }
+
+    public function testAssetAPIUsagesInBladeViews()
+    {
+        $view = /** @lang Blade */ <<<'Blade'
+        @if(Asset::exists('app.css'))
+            <link rel="stylesheet" href="{{ Asset::get('app.css') }}">
+            <link rel="stylesheet" href="{{ Hyde::asset('app.css') }}">
+            <link rel="stylesheet" href="{{ asset('app.css') }}">
+        @endif
+        
+        @if(Asset::exists('missing.png'))
+            Found missing.png
+        @else
+            Missing missing.png
+        @endif
+        Blade;
+
+        $html = Blade::render($view);
+
+        $this->assertSame(<<<HTML
+        <link rel="stylesheet" href="media/app.css?v={$this->getAppStylesVersion()}">
+            <link rel="stylesheet" href="media/app.css?v={$this->getAppStylesVersion()}">
+            <link rel="stylesheet" href="media/app.css?v={$this->getAppStylesVersion()}">
+        
+            Missing missing.png
+
+        HTML, $html);
+    }
+
+    public function testThrowsExceptionForNonExistentMediaFile()
+    {
+        $nonExistentFile = 'non_existent_file.txt';
+
+        $accessors = [
+            fn () => \Hyde\Facades\Asset::get($nonExistentFile),
+            fn () => \Hyde::asset($nonExistentFile),
+            fn () => \Hyde\Hyde::asset($nonExistentFile),
+            fn () => Hyde::kernel()->asset($nonExistentFile),
+            fn () => HydeKernel::getInstance()->asset($nonExistentFile),
+            fn () => hyde()->asset($nonExistentFile),
+            fn () => asset($nonExistentFile),
+            fn () => new MediaFile($nonExistentFile),
+            fn () => MediaFile::make($nonExistentFile),
+            fn () => MediaFile::get($nonExistentFile),
+        ];
+
+        foreach ($accessors as $test => $accessor) {
+            try {
+                $accessor();
+                $this->fail('Expected exception to be thrown for syntax test #'.$test);
+            } catch (FileNotFoundException $exception) {
+                $this->assertSame('File [_media/non_existent_file.txt] not found when trying to resolve a media asset.', $exception->getMessage());
+            }
+        }
+
+        $this->assertSame(Hyde::path('_media/non_existent_file.txt'), MediaFile::sourcePath($nonExistentFile));
+        $this->assertSame(Hyde::path('_site/media/non_existent_file.txt'), MediaFile::outputPath($nonExistentFile));
+    }
+
+    public function testAssetSupportsCustomMediaDirectories()
+    {
+        Hyde::setMediaDirectory('_assets');
+
+        $this->directory('_assets');
+        $this->file('_assets/app.css');
+
+        $path = (string) Asset::get('app.css');
+
+        $this->assertIsString($path);
+        $this->assertSame('assets/app.css?v='.hash_file('crc32', Hyde::path('_assets/app.css')), $path);
+    }
+
+    protected function getAppStylesVersion(): string
+    {
+        return MediaFile::get('app.css')->getHash();
+    }
+}
diff --git a/packages/framework/tests/Feature/AssetServiceTest.php b/packages/framework/tests/Feature/AssetServiceTest.php
deleted file mode 100644
index ae8661b8118..00000000000
--- a/packages/framework/tests/Feature/AssetServiceTest.php
+++ /dev/null
@@ -1,50 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Hyde\Framework\Testing\Feature;
-
-use Hyde\Framework\Services\AssetService;
-use Hyde\Hyde;
-use Hyde\Testing\TestCase;
-
-/**
- * @covers \Hyde\Framework\Services\AssetService
- *
- * @see \Hyde\Framework\Testing\Unit\AssetServiceUnitTest
- */
-class AssetServiceTest extends TestCase
-{
-    public function testMediaLinkReturnsMediaPathWithCacheKey()
-    {
-        $service = new AssetService();
-
-        $this->assertIsString($path = $service->mediaLink('app.css'));
-        $this->assertSame('media/app.css?v='.md5_file(Hyde::path('_media/app.css')), $path);
-    }
-
-    public function testMediaLinkReturnsMediaPathWithoutCacheKeyIfCacheBustingIsDisabled()
-    {
-        config(['hyde.enable_cache_busting' => false]);
-
-        $service = new AssetService();
-        $path = $service->mediaLink('app.css');
-
-        $this->assertIsString($path);
-        $this->assertSame('media/app.css', $path);
-    }
-
-    public function testMediaLinkSupportsCustomMediaDirectories()
-    {
-        $this->directory('_assets');
-        $this->file('_assets/app.css');
-
-        Hyde::setMediaDirectory('_assets');
-
-        $service = new AssetService();
-        $path = $service->mediaLink('app.css');
-
-        $this->assertIsString($path);
-        $this->assertSame('assets/app.css?v='.md5_file(Hyde::path('_assets/app.css')), $path);
-    }
-}
diff --git a/packages/framework/tests/Feature/DiscoveryServiceTest.php b/packages/framework/tests/Feature/DiscoveryServiceTest.php
index e545cd64b7b..1cb508ac488 100644
--- a/packages/framework/tests/Feature/DiscoveryServiceTest.php
+++ b/packages/framework/tests/Feature/DiscoveryServiceTest.php
@@ -88,10 +88,12 @@ public function testGetMediaAssetFilesDiscoversFiles()
     {
         $testFiles = ['png', 'svg', 'jpg', 'jpeg', 'gif', 'ico', 'css', 'js'];
 
-        foreach ($testFiles as $fileType) {
-            $path = 'test.'.$fileType;
-            $this->file('_media/'.$path);
-            $this->assertContains($path, MediaFile::files());
+        foreach ($testFiles as $type) {
+            $this->file("_media/test.$type");
+        }
+
+        foreach ($testFiles as $type) {
+            $this->assertContains("test.$type", MediaFile::files());
         }
     }
 
@@ -101,6 +103,8 @@ public function testGetMediaAssetFilesDiscoversCustomFileTypes()
         $this->file("_media/$path");
         $this->assertNotContains($path, MediaFile::files());
         self::mockConfig(['hyde.media_extensions' => ['custom']]);
+
+        $this->resetKernel(); // Reboot to rediscover new files
         $this->assertContains($path, MediaFile::files());
     }
 
@@ -131,6 +135,7 @@ public function testMediaAssetExtensionsCanBeAddedByCommaSeparatedValues()
         $this->assertSame([], MediaFile::files());
 
         self::mockConfig(['hyde.media_extensions' => ['1,2,3']]);
+        $this->resetKernel(); // Reboot to rediscover new files
         $this->assertSame(['test.1', 'test.2', 'test.3'], MediaFile::files());
     }
 
@@ -143,6 +148,7 @@ public function testMediaAssetExtensionsCanBeAddedByArray()
 
         $this->assertSame([], MediaFile::files());
         self::mockConfig(['hyde.media_extensions' => ['1', '2', '3']]);
+        $this->resetKernel(); // Reboot to rediscover new files
         $this->assertSame(['test.1', 'test.2', 'test.3'], MediaFile::files());
     }
 
diff --git a/packages/framework/tests/Feature/DynamicMarkdownLinksFeatureTest.php b/packages/framework/tests/Feature/DynamicMarkdownLinksFeatureTest.php
index 60208243185..e0981f7cabb 100644
--- a/packages/framework/tests/Feature/DynamicMarkdownLinksFeatureTest.php
+++ b/packages/framework/tests/Feature/DynamicMarkdownLinksFeatureTest.php
@@ -39,9 +39,18 @@ public static function tearDownAfterClass(): void
         unlink('_media/logo.png');
         unlink('_media/image.jpg');
 
+        DynamicMarkdownLinkProcessor::resetAssetMapCache();
+
         parent::tearDownAfterClass();
     }
 
+    protected function setUp(): void
+    {
+        parent::setUp();
+
+        config(['hyde.cache_busting' => false]);
+    }
+
     public function testBasicDynamicMarkdownLinks()
     {
         $input = <<<'MARKDOWN'
diff --git a/packages/framework/tests/Feature/FeaturedImageFactoryTest.php b/packages/framework/tests/Feature/FeaturedImageFactoryTest.php
index 7774e713ed1..b38f0b77bd3 100644
--- a/packages/framework/tests/Feature/FeaturedImageFactoryTest.php
+++ b/packages/framework/tests/Feature/FeaturedImageFactoryTest.php
@@ -16,6 +16,15 @@
  */
 class FeaturedImageFactoryTest extends TestCase
 {
+    protected function setUp(): void
+    {
+        parent::setUp();
+
+        config(['hyde.cache_busting' => false]);
+
+        $this->file('_media/foo');
+    }
+
     public function testWithDataFromSchema()
     {
         $array = [
@@ -98,6 +107,8 @@ public function testImagePathsAreNormalizedForCustomizedMediaDirectory()
     {
         Hyde::setMediaDirectory('_assets');
 
+        $this->file('_assets/foo');
+
         $this->assertSourceIsSame('assets/foo', ['image' => 'foo']);
         $this->assertSourceIsSame('assets/foo', ['image' => 'assets/foo']);
         $this->assertSourceIsSame('assets/foo', ['image' => '_assets/foo']);
@@ -111,6 +122,8 @@ public function testImagePathsAreNormalizedForCustomizedMediaDirectoryWithoutUnd
     {
         Hyde::setMediaDirectory('assets');
 
+        $this->file('assets/foo');
+
         $this->assertSourceIsSame('assets/foo', ['image' => 'foo']);
         $this->assertSourceIsSame('assets/foo', ['image' => 'assets/foo']);
         $this->assertSourceIsSame('assets/foo', ['image' => 'assets/foo']);
@@ -120,6 +133,19 @@ public function testImagePathsAreNormalizedForCustomizedMediaDirectoryWithoutUnd
         $this->assertSourceIsSame('assets/foo', ['image' => ['source' => 'assets/foo']]);
     }
 
+    public function testImagePathsWithCacheBusting()
+    {
+        config(['hyde.cache_busting' => true]);
+
+        $this->assertSourceIsSame('media/foo?v=00000000', ['image' => 'foo']);
+        $this->assertSourceIsSame('media/foo?v=00000000', ['image' => 'media/foo']);
+        $this->assertSourceIsSame('media/foo?v=00000000', ['image' => '_media/foo']);
+
+        $this->assertSourceIsSame('media/foo?v=00000000', ['image' => ['source' => 'foo']]);
+        $this->assertSourceIsSame('media/foo?v=00000000', ['image' => ['source' => 'media/foo']]);
+        $this->assertSourceIsSame('media/foo?v=00000000', ['image' => ['source' => '_media/foo']]);
+    }
+
     protected function makeFromArray(array $matter): FeaturedImage
     {
         return FeaturedImageFactory::make(new FrontMatter($matter));
diff --git a/packages/framework/tests/Feature/FeaturedImageTest.php b/packages/framework/tests/Feature/FeaturedImageTest.php
index ca252cd7852..031018a0d22 100644
--- a/packages/framework/tests/Feature/FeaturedImageTest.php
+++ b/packages/framework/tests/Feature/FeaturedImageTest.php
@@ -17,6 +17,16 @@
  */
 class FeaturedImageTest extends TestCase
 {
+    protected function setUp(): void
+    {
+        parent::setUp();
+
+        config(['hyde.cache_busting' => false]);
+
+        $this->file('_media/foo', 'test');
+        $this->file('_media/source');
+    }
+
     public function testGetMetadataArray()
     {
         $this->assertSame([
@@ -52,10 +62,8 @@ public function testCanConstructFeaturedImage()
 
     public function testFeaturedImageGetContentLength()
     {
-        $this->file('_media/foo', 'image');
-
         $image = new FeaturedImage('_media/foo', ...$this->defaultArguments());
-        $this->assertSame(5, $image->getContentLength());
+        $this->assertSame(4, $image->getContentLength());
     }
 
     public function testFeaturedImageGetContentLengthWithRemoteSource()
@@ -108,6 +116,16 @@ public function testGetSourceMethod()
         $this->assertSame('http', FeaturedImageFactory::make(new FrontMatter(['image' => 'http']))->getSource());
     }
 
+    public function testImagePathsWithCacheBusting()
+    {
+        config(['hyde.cache_busting' => true]);
+
+        $this->assertSame('media/foo?v=accf8b33', (new FeaturedImage('_media/foo', ...$this->defaultArguments()))->getSource());
+        $this->assertSame('media/foo?v=accf8b33', FeaturedImageFactory::make(new FrontMatter(['image.source' => 'foo']))->getSource());
+        $this->assertSame('media/foo?v=accf8b33', FeaturedImageFactory::make(new FrontMatter(['image.source' => 'media/foo']))->getSource());
+        $this->assertSame('media/foo?v=accf8b33', FeaturedImageFactory::make(new FrontMatter(['image.source' => '_media/foo']))->getSource());
+    }
+
     protected function defaultArguments(): array
     {
         return ['alt', 'title', 'author', 'authorUrl', 'copyright', 'license', 'licenseUrl'];
diff --git a/packages/framework/tests/Feature/FilesystemFacadeTest.php b/packages/framework/tests/Feature/FilesystemFacadeTest.php
index 1c4216c438a..4b67f34ba31 100644
--- a/packages/framework/tests/Feature/FilesystemFacadeTest.php
+++ b/packages/framework/tests/Feature/FilesystemFacadeTest.php
@@ -13,6 +13,7 @@
  * @covers \Hyde\Foundation\Kernel\Filesystem
  * @covers \Hyde\Framework\Concerns\Internal\ForwardsIlluminateFilesystem
  *
+ * @see \FilesystemFacadeMimeTypeHelperUnitTest
  * @see \Hyde\Framework\Testing\Unit\FilesystemFacadeUnitTest
  */
 class FilesystemFacadeTest extends TestCase
@@ -94,4 +95,112 @@ public function testMethodWithMixedSequentialAndNamedArgumentsSkippingMiddleOne(
 
         rmdir(Hyde::path('foo'));
     }
+
+    public function testFindMimeTypeLookup()
+    {
+        $this->assertSame('text/plain', Filesystem::findMimeType('test.txt'));
+    }
+
+    public function testFindMimeTypeWithKnownFile()
+    {
+        $this->file('test.txt', 'This is a test file.');
+        $this->assertSame('text/plain', Filesystem::findMimeType('test.txt'));
+    }
+
+    public function testFindMimeTypeWithUnknownExtension()
+    {
+        $this->file('text.unknown', 'text');
+        $this->assertSame('text/plain', Filesystem::findMimeType('text.unknown'));
+    }
+
+    public function testFindMimeTypeWithBlankFile()
+    {
+        $this->file('blank.unknown', '');
+        $this->assertSame('application/x-empty', Filesystem::findMimeType('blank.unknown'));
+    }
+
+    public function testFindMimeTypeWithEmptyFile()
+    {
+        $this->file('empty.unknown');
+        $this->assertSame('application/x-empty', Filesystem::findMimeType('empty.unknown'));
+    }
+
+    public function testFindMimeTypeWithJsonFile()
+    {
+        $this->file('json.unknown', '{"key": "value"}');
+        $this->assertSame('application/json', Filesystem::findMimeType('json.unknown'));
+    }
+
+    public function testFindMimeTypeWithXmlFile()
+    {
+        $this->file('xml.unknown', '<?xml version="1.0" encoding="UTF-8"?><root></root>');
+        $this->assertSame('text/xml', Filesystem::findMimeType('xml.unknown'));
+    }
+
+    public function testFindMimeTypeWithHtmlFile()
+    {
+        $this->file('html.unknown', '<!DOCTYPE html><html><head><title>Test</title></head><body></body></html>');
+        $this->assertSame('text/html', Filesystem::findMimeType('html.unknown'));
+    }
+
+    public function testFindMimeTypeWithYamlFile()
+    {
+        $this->file('yaml.unknown', 'key: value');
+        $this->assertSame('text/plain', Filesystem::findMimeType('yaml.unknown')); // YAML is not detected by fileinfo
+    }
+
+    public function testFindMimeTypeWithCssFile()
+    {
+        $this->file('css.unknown', 'body { color: red; }');
+        $this->assertSame('text/plain', Filesystem::findMimeType('css.unknown')); // CSS is not detected by fileinfo
+    }
+
+    public function testFindMimeTypeWithJsFile()
+    {
+        $this->file('js.unknown', 'console.log("Hello, World!");');
+        $this->assertSame('text/plain', Filesystem::findMimeType('js.unknown')); // JavaScript is not detected by fileinfo
+    }
+
+    public function testFindMimeTypeWithBinaryFile()
+    {
+        $this->file('binary.unknown', "\x00\x01\x02\x03\x04\x05\x06\x07\x08\x09\x0A\x0B\x0C\x0D\x0E\x0F"); // 16 bytes of binary data
+        $this->assertSame('application/octet-stream', Filesystem::findMimeType('binary.unknown'));
+    }
+
+    public function testFindMimeTypeWithPngFile()
+    {
+        $this->file('png.unknown', base64_decode('iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAQAAAC1HAwCAAAAC0lEQVR42mNkAAIAAAoAAvM1P4AAAAASUVORK5CYII=')); // 1x1 transparent PNG
+        $this->assertSame('image/png', Filesystem::findMimeType('png.unknown'));
+    }
+
+    public function testFindMimeTypeWithJpegFile()
+    {
+        $this->file('jpeg.unknown', base64_decode('/9j/4AAQSkZJRgABAQEAYABgAAD/4QA6RXhpZgAATU0AKgAAAAgAA1IBAAABAAAAngIBAAABAAAAnwICAAABAAAAnQ==')); // 1x1 JPEG
+        $this->assertSame('image/jpeg', Filesystem::findMimeType('jpeg.unknown'));
+    }
+
+    public function testFindMimeTypeWithGifFile()
+    {
+        $this->file('gif.unknown', base64_decode('R0lGODlhAQABAIAAAP///wAAACwAAAAAAQABAAACAkQBADs=')); // 1x1 GIF
+        $this->assertSame('image/gif', Filesystem::findMimeType('gif.unknown'));
+    }
+
+    public function testFindMimeTypeWithNonExistingFile()
+    {
+        $this->assertSame('text/plain', Filesystem::findMimeType('non_existing_file.txt'));
+    }
+
+    public function testFindMimeTypeUsesLookupBeforeFileinfo()
+    {
+        $this->file('file.png', 'Not PNG content');
+        $this->assertSame('image/png', Filesystem::findMimeType('file.png'));
+
+        $this->file('png.txt', base64_decode('iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAQAAAC1HAwCAAAAC0lEQVR42mNkAAIAAAoAAvM1P4AAAAASUVORK5CYII=')); // 1x1 transparent PNG
+        $this->assertSame('text/plain', Filesystem::findMimeType('png.txt'));
+    }
+
+    protected function createExpectation(string $method, mixed $returns, ...$args): void
+    {
+        File::shouldReceive($method)->withArgs($args)->once()->andReturn($returns);
+    }
 }
diff --git a/packages/framework/tests/Feature/Foundation/FilesystemTest.php b/packages/framework/tests/Feature/Foundation/FilesystemTest.php
index 5527f9ce127..bc4ccfcb7e3 100644
--- a/packages/framework/tests/Feature/Foundation/FilesystemTest.php
+++ b/packages/framework/tests/Feature/Foundation/FilesystemTest.php
@@ -5,6 +5,7 @@
 namespace Hyde\Framework\Testing\Feature\Foundation;
 
 use Hyde\Foundation\HydeKernel;
+use Illuminate\Support\Collection;
 use Hyde\Foundation\Kernel\Filesystem;
 use Hyde\Foundation\PharSupport;
 use Hyde\Hyde;
@@ -13,6 +14,7 @@
 use Hyde\Pages\HtmlPage;
 use Hyde\Pages\MarkdownPage;
 use Hyde\Pages\MarkdownPost;
+use Hyde\Support\Filesystem\MediaFile;
 use Hyde\Testing\UnitTestCase;
 
 use function Hyde\normalize_slashes;
@@ -20,6 +22,7 @@
 /**
  * @covers \Hyde\Foundation\HydeKernel
  * @covers \Hyde\Foundation\Kernel\Filesystem
+ * @covers \Hyde\Foundation\Concerns\HasMediaFiles
  */
 class FilesystemTest extends UnitTestCase
 {
@@ -28,6 +31,7 @@ class FilesystemTest extends UnitTestCase
     protected Filesystem $filesystem;
 
     protected static bool $needsKernel = true;
+    protected static bool $needsConfig = true;
 
     protected function setUp(): void
     {
@@ -258,32 +262,20 @@ public function testHelperForDocumentationPages()
 
     public function testHelperForMediaPath()
     {
-        $this->assertSame(Hyde::path('_media'), Hyde::mediaPath());
-    }
-
-    public function testHelperForMediaPathReturnsPathToFileWithinTheDirectory()
-    {
-        $this->assertSame(Hyde::path('_media/foo.css'), Hyde::mediaPath('foo.css'));
-    }
+        $this->assertSame(Hyde::path('_media'), MediaFile::sourcePath());
+        $this->assertSame(MediaFile::sourcePath(), MediaFile::sourcePath());
 
-    public function testGetMediaPathReturnsAbsolutePath()
-    {
-        $this->assertSame(Hyde::path('_media'), Hyde::mediaPath());
+        $this->assertSame(Hyde::path('_media/foo.png'), MediaFile::sourcePath('foo.png'));
+        $this->assertSame(MediaFile::sourcePath('foo.png'), MediaFile::sourcePath('foo.png'));
     }
 
     public function testHelperForMediaOutputPath()
     {
-        $this->assertSame(Hyde::path('_site/media'), Hyde::siteMediaPath());
-    }
+        $this->assertSame(Hyde::path('_site/media'), MediaFile::outputPath());
+        $this->assertSame(MediaFile::outputPath(), MediaFile::outputPath());
 
-    public function testHelperForMediaOutputPathReturnsPathToFileWithinTheDirectory()
-    {
-        $this->assertSame(Hyde::path('_site/media/foo.css'), Hyde::siteMediaPath('foo.css'));
-    }
-
-    public function testGetMediaOutputPathReturnsAbsolutePath()
-    {
-        $this->assertSame(Hyde::path('_site/media'), Hyde::siteMediaPath());
+        $this->assertSame(Hyde::path('_site/media/foo.png'), MediaFile::outputPath('foo.png'));
+        $this->assertSame(MediaFile::outputPath('foo.png'), MediaFile::outputPath('foo.png'));
     }
 
     public function testHelperForSiteOutputPath()
@@ -361,4 +353,33 @@ public function testPathToRelativeHelperDoesNotModifyNonProjectPaths()
             $this->assertSame(normalize_slashes($testString), Hyde::pathToRelative($testString));
         }
     }
+
+    public function testAssetsMethodGetsAllSiteAssets()
+    {
+        $this->assertEquals(new Collection([
+            'app.css' => new MediaFile('_media/app.css'),
+        ]), $this->filesystem->assets());
+    }
+
+    public function testAssetsMethodGetsAllSiteAssetsAsArray()
+    {
+        $assets = $this->filesystem->assets()->toArray();
+
+        $assets['app.css']['length'] = 123;
+
+        $this->assertSame([
+            'app.css' => [
+                'name' => 'app.css',
+                'path' => '_media/app.css',
+                'length' => 123,
+                'mimeType' => 'text/css',
+                'hash' => hash_file('crc32', Hyde::path('_media/app.css')),
+            ],
+        ], $assets);
+    }
+
+    public function testAssetsMethodReturnsAssetCollectionSingleton()
+    {
+        $this->assertSame($this->filesystem->assets(), $this->filesystem->assets());
+    }
 }
diff --git a/packages/framework/tests/Feature/Foundation/HyperlinksTest.php b/packages/framework/tests/Feature/Foundation/HyperlinksTest.php
index 3234e7cdcee..2b72bf203cb 100644
--- a/packages/framework/tests/Feature/Foundation/HyperlinksTest.php
+++ b/packages/framework/tests/Feature/Foundation/HyperlinksTest.php
@@ -7,6 +7,7 @@
 use Hyde\Foundation\HydeKernel;
 use Hyde\Foundation\Facades\Routes;
 use Hyde\Foundation\Kernel\Hyperlinks;
+use Hyde\Support\Filesystem\MediaFile;
 use Hyde\Framework\Exceptions\FileNotFoundException;
 use Hyde\Hyde;
 use Hyde\Testing\TestCase;
@@ -27,94 +28,107 @@ protected function setUp(): void
 
     public function testAssetHelperGetsRelativeWebLinkToImageStoredInSiteMediaFolder()
     {
-        $tests = [
-            'test.jpg' => 'media/test.jpg',
-            'foo' => 'media/foo',
-            'http://example.com/test.jpg' => 'http://example.com/test.jpg',
-            'https://example.com/test.jpg' => 'https://example.com/test.jpg',
-        ];
+        $this->file('_media/test.jpg');
 
-        foreach ($tests as $input => $expected) {
-            $this->assertSame($this->class->asset($input), $expected);
-        }
+        $this->assertSame('media/test.jpg?v=00000000', (string) $this->class->asset('test.jpg'));
     }
 
     public function testAssetHelperResolvesPathsForNestedPages()
     {
-        $tests = [
-            'test.jpg' => '../media/test.jpg',
-            'foo' => '../media/foo',
-            'http://example.com/test.jpg' => 'http://example.com/test.jpg',
-            'https://example.com/test.jpg' => 'https://example.com/test.jpg',
-        ];
+        $this->file('_media/test.jpg');
 
-        foreach ($tests as $input => $expected) {
-            $this->mockCurrentPage('foo/bar');
-            $this->assertSame($this->class->asset($input), $expected);
-        }
+        $this->mockCurrentPage('foo/bar');
+        $this->assertSame('../media/test.jpg?v=00000000', (string) $this->class->asset('test.jpg'));
     }
 
-    public function testAssetHelperReturnsQualifiedAbsoluteUriWhenRequestedAndSiteHasBaseUrl()
+    public function testAssetHelperReturnsQualifiedAbsoluteUriWhenSiteHasBaseUrl()
     {
         config(['hyde.url' => 'https://example.org']);
-        $this->assertSame('https://example.org/media/test.jpg', $this->class->asset('test.jpg', true));
+        $this->file('_media/test.jpg');
+        $this->assertSame('https://example.org/media/test.jpg?v=00000000', (string) $this->class->asset('test.jpg'));
     }
 
-    public function testAssetHelperReturnsDefaultRelativePathWhenQualifiedAbsoluteUriIsRequestedButSiteHasNoBaseUrl()
+    public function testAssetHelperReturnsDefaultRelativePathWhenSiteHasNoBaseUrl()
     {
         $this->withoutSiteUrl();
-        $this->assertSame('media/test.jpg', $this->class->asset('test.jpg', true));
+        $this->file('_media/test.jpg');
+        $this->assertSame('media/test.jpg?v=00000000', (string) $this->class->asset('test.jpg'));
     }
 
-    public function testAssetHelperReturnsDefaultRelativePathWhenQualifiedAbsoluteUriIsRequestedButSiteBaseUrlIsLocalhost()
+    public function testAssetHelperReturnsDefaultRelativePathWhenSiteBaseUrlIsLocalhost()
     {
-        $this->assertSame('media/test.jpg', $this->class->asset('test.jpg', true));
+        $this->file('_media/test.jpg');
+        $this->assertSame('media/test.jpg?v=00000000', (string) $this->class->asset('test.jpg'));
     }
 
-    public function testAssetHelperReturnsInputWhenQualifiedAbsoluteUriIsRequestedButImageIsAlreadyQualified()
+    public function testAssetHelperUsesConfiguredMediaDirectory()
     {
-        $this->assertSame('http://localhost/media/test.jpg', $this->class->asset('http://localhost/media/test.jpg', true));
+        Hyde::setMediaDirectory('_assets');
+        $this->file('_assets/test.jpg');
+        $this->assertSame('assets/test.jpg?v=00000000', (string) $this->class->asset('test.jpg'));
     }
 
-    public function testAssetHelperReturnsInputWhenQualifiedAbsoluteUriIsRequestedButImageIsAlreadyQualifiedRegardlessOfMatchingTheConfiguredUrl()
+    public function testAssetHelperThrowsExceptionForNonExistentFile()
     {
-        config(['hyde.url' => 'https://example.org']);
-        $this->assertSame('http://localhost/media/test.jpg', $this->class->asset('http://localhost/media/test.jpg', true));
+        $this->expectException(FileNotFoundException::class);
+        $this->class->asset('non_existent_file.jpg');
     }
 
-    public function testAssetHelperUsesConfiguredMediaDirectory()
+    public function testAssetHelperCanGetFileWithNoExtension()
     {
-        Hyde::setMediaDirectory('_assets');
-        $this->assertSame('assets/test.jpg', $this->class->asset('test.jpg'));
+        $this->file('_media/no_extension');
+        $this->assertInstanceOf(MediaFile::class, $this->class->asset('no_extension'));
     }
 
-    public function testMediaLinkHelper()
+    public function testAssetHelperCanGetFileWithNonMediaExtension()
     {
-        $this->assertSame('media/foo', $this->class->mediaLink('foo'));
+        $this->file('_media/test.foo');
+        $this->assertInstanceOf(MediaFile::class, $this->class->asset('test.foo'));
     }
 
-    public function testMediaLinkHelperWithRelativePath()
+    public function testAssetHelperThrowsExceptionWithHelpfulMessage()
     {
-        $this->mockCurrentPage('foo/bar');
-        $this->assertSame('../media/foo', $this->class->mediaLink('foo'));
+        $this->expectExceptionMessage('File [_media/test.png] not found when trying to resolve a media asset.');
+        $this->expectException(FileNotFoundException::class);
+        $this->class->asset('test.png');
     }
 
-    public function testMediaLinkHelperUsesConfiguredMediaDirectory()
+    public function testAssetHelperReturnsInputWhenImageIsAlreadyQualifiedRegardlessOfMatchingTheConfiguredUrl()
     {
-        Hyde::setMediaDirectory('_assets');
-        $this->assertSame('assets/foo', $this->class->mediaLink('foo'));
+        $this->expectExceptionMessage('File [_media/http://localhost/media/test.jpg] not found when trying to resolve a media asset.');
+        $this->expectException(FileNotFoundException::class);
+
+        config(['hyde.url' => 'https://example.org']);
+        $this->assertSame('http://localhost/media/test.jpg?v=00000000', (string) $this->class->asset('http://localhost/media/test.jpg'));
+    }
+
+    public function testAssetHelper()
+    {
+        $this->file('_media/foo', 'test');
+        $class = $this->class;
+        $this->assertSame('media/foo?v=accf8b33', (string) $class->asset('foo'));
+    }
+
+    public function testAssetHelperWithRelativePath()
+    {
+        $this->mockCurrentPage('foo/bar');
+        $this->file('_media/foo', 'test');
+        $class = $this->class;
+        $this->assertSame('../media/foo?v=accf8b33', (string) $class->asset('foo'));
     }
 
-    public function testMediaLinkHelperWithValidationAndExistingFile()
+    public function testAssetHelperWithExistingFile()
     {
-        $this->file('_media/foo');
-        $this->assertSame('media/foo', $this->class->mediaLink('foo', true));
+        $this->file('_media/foo', 'test');
+        $class = $this->class;
+        $this->assertSame('media/foo?v=accf8b33', (string) $class->asset('foo'));
     }
 
-    public function testMediaLinkHelperWithValidationAndNonExistingFile()
+    public function testAssetHelperWithNonExistingFile()
     {
         $this->expectException(FileNotFoundException::class);
-        $this->class->mediaLink('foo', true);
+        $class = $this->class;
+        (string) $class->asset('foo');
     }
 
     public function testRouteHelper()
diff --git a/packages/framework/tests/Feature/HelpersTest.php b/packages/framework/tests/Feature/HelpersTest.php
index 300342e4735..9efbfb6532b 100644
--- a/packages/framework/tests/Feature/HelpersTest.php
+++ b/packages/framework/tests/Feature/HelpersTest.php
@@ -13,6 +13,8 @@
 use Symfony\Component\Yaml\Yaml;
 use Hyde\Support\Facades\Render;
 use Hyde\Foundation\Facades\Routes;
+use Hyde\Support\Filesystem\MediaFile;
+use Hyde\Framework\Exceptions\FileNotFoundException;
 
 /**
  * Covers the helpers in helpers.php.
@@ -21,6 +23,13 @@
  */
 class HelpersTest extends TestCase
 {
+    protected function setUp(): void
+    {
+        parent::setUp();
+
+        config(['hyde.cache_busting' => false]);
+    }
+
     /** @covers ::hyde */
     public function testHydeFunctionExists()
     {
@@ -70,67 +79,98 @@ public function testUnslashFunctionTrimsTrailingSlashes()
     /** @covers ::asset */
     public function testAssetFunction()
     {
-        $this->assertSame(Hyde::asset('foo'), asset('foo'));
-        $this->assertSame('media/foo', asset('foo'));
+        $this->assertInstanceOf(MediaFile::class, asset('app.css'));
+        $this->assertEquals(new MediaFile('media/app.css'), asset('app.css'));
+
+        $this->assertSame(Hyde::asset('app.css'), asset('app.css'));
+        $this->assertSame('media/app.css', (string) asset('app.css'));
     }
 
     /** @covers ::asset */
-    public function testAssetFunctionWithQualifiedUrl()
+    public function testAssetFunctionWithCacheBusting()
     {
-        $this->assertSame(Hyde::asset('foo', true), asset('foo', true));
-        $this->assertSame('media/foo', asset('foo', true));
+        config(['hyde.cache_busting' => true]);
+
+        $this->assertInstanceOf(MediaFile::class, asset('app.css'));
+        $this->assertEquals(new MediaFile('media/app.css'), asset('app.css'));
+
+        $this->assertSame(Hyde::asset('app.css'), asset('app.css'));
+        $this->assertSame(
+            'media/app.css?v='.hash_file('crc32', Hyde::path('_media/app.css')),
+            (string) asset('app.css')
+        );
     }
 
     /** @covers ::asset */
-    public function testAssetFunctionWithQualifiedUrlAndSetBaseUrl()
+    public function testAssetFunctionWithExternalUrl()
     {
-        $this->app['config']->set(['hyde.url' => 'https://example.com']);
-        $this->assertSame('https://example.com/media/foo', asset('foo', true));
+        $this->expectException(FileNotFoundException::class);
+        $this->expectExceptionMessage('File [_media/https://example.com/foo] not found when trying to resolve a media asset.');
+        $this->assertSame('https://example.com/foo', asset('https://example.com/foo'));
     }
 
     /** @covers ::asset */
-    public function testAssetFunctionWithExternalUrl()
+    public function testAssetFunctionWithSetBaseUrl()
     {
-        $this->assertSame('https://example.com/foo', asset('https://example.com/foo'));
-        $this->assertSame('https://example.com/foo', asset('https://example.com/foo', true));
+        $this->assertInstanceOf(MediaFile::class, asset('app.css'));
+        $this->assertEquals(new MediaFile('media/app.css'), asset('app.css'));
+
+        $this->app['config']->set(['hyde.url' => 'https://example.com']);
+        $this->assertSame('https://example.com/media/app.css', (string) asset('app.css'));
     }
 
     /** @covers ::asset */
-    public function testAssetFunctionWithQualifiedUrlAndNoBaseUrl()
+    public function testAssetFunctionWithNoBaseUrl()
     {
+        $this->assertInstanceOf(MediaFile::class, asset('app.css'));
+        $this->assertEquals(new MediaFile('media/app.css'), asset('app.css'));
+
         $this->app['config']->set(['hyde.url' => null]);
-        $this->assertSame('media/foo', asset('foo', true));
+        $this->assertSame('media/app.css', (string) asset('app.css'));
     }
 
     /** @covers ::asset */
-    public function testAssetFunctionWithQualifiedUrlAndLocalhostBaseUrl()
+    public function testAssetFunctionWithLocalhostBaseUrl()
     {
+        $this->assertInstanceOf(MediaFile::class, asset('app.css'));
+        $this->assertEquals(new MediaFile('media/app.css'), asset('app.css'));
+
         $this->app['config']->set(['hyde.url' => 'http://localhost']);
-        $this->assertSame('media/foo', asset('foo', true));
+        $this->assertSame('media/app.css', (string) asset('app.css'));
     }
 
     /** @covers ::asset */
     public function testAssetFunctionFromNestedPage()
     {
+        $this->assertInstanceOf(MediaFile::class, asset('app.css'));
+        $this->assertEquals(new MediaFile('media/app.css'), asset('app.css'));
+
         Render::shouldReceive('getRouteKey')->andReturn('foo/bar');
 
-        $this->assertSame('../media/foo', asset('foo'));
+        $this->assertSame('../media/app.css', (string) asset('app.css'));
     }
 
     /** @covers ::asset */
     public function testAssetFunctionFromDeeplyNestedPage()
     {
+        $this->assertInstanceOf(MediaFile::class, asset('app.css'));
+        $this->assertEquals(new MediaFile('media/app.css'), asset('app.css'));
+
         Render::shouldReceive('getRouteKey')->andReturn('foo/bar/baz');
 
-        $this->assertSame('../../media/foo', asset('foo'));
+        $this->assertSame('../../media/app.css', (string) asset('app.css'));
     }
 
     /** @covers ::asset */
     public function testAssetFunctionWithCustomMediaDirectory()
     {
+        $this->file('custom/app.css');
         Hyde::setMediaDirectory('custom');
 
-        $this->assertSame('custom/foo', asset('foo'));
+        $this->assertInstanceOf(MediaFile::class, asset('app.css'));
+        $this->assertEquals(new MediaFile('custom/app.css'), asset('app.css'));
+
+        $this->assertSame('custom/app.css', (string) asset('app.css'));
     }
 
     /** @covers ::route */
diff --git a/packages/framework/tests/Feature/HydeKernelTest.php b/packages/framework/tests/Feature/HydeKernelTest.php
index 368dd3a6bcd..bc4591539dc 100644
--- a/packages/framework/tests/Feature/HydeKernelTest.php
+++ b/packages/framework/tests/Feature/HydeKernelTest.php
@@ -13,6 +13,7 @@
 use Hyde\Foundation\HydeKernel;
 use Hyde\Enums\Feature;
 use Hyde\Foundation\Kernel\Filesystem;
+use Hyde\Support\Filesystem\MediaFile;
 use Hyde\Framework\HydeServiceProvider;
 use Hyde\Hyde;
 use Hyde\Pages\BladePage;
@@ -172,35 +173,117 @@ public function testRelativeLinkHelperReturnsRelativeLinkToDestination()
         $this->assertSame('../foo', Hyde::relativeLink('foo'));
     }
 
-    public function testMediaLinkHelperReturnsRelativeLinkToDestination()
+    public function testAssetHelperReturnsRelativeLinkToDestination()
     {
+        $this->file('_media/foo');
+
         Render::share('routeKey', 'bar');
-        $this->assertSame('media/foo', Hyde::mediaLink('foo'));
+        $this->assertSame('media/foo?v=00000000', (string) Hyde::asset('foo'));
 
         Render::share('routeKey', 'foo/bar');
-        $this->assertSame('../media/foo', Hyde::mediaLink('foo'));
+        $this->assertSame('../media/foo?v=00000000', (string) Hyde::asset('foo'));
+    }
+
+    public function testAssetHelperReturnsMediaFileInstanceForGivenName()
+    {
+        $this->file('_media/foo.jpg');
+
+        $asset = Hyde::asset('foo.jpg');
+
+        $this->assertInstanceOf(MediaFile::class, $asset);
+        $this->assertEquals(new MediaFile('_media/foo.jpg'), $asset);
+
+        $this->assertSame('foo.jpg', $asset->getName());
+        $this->assertSame('_media/foo.jpg', $asset->getPath());
+        $this->assertSame('media/foo.jpg?v=00000000', $asset->getLink());
+        $this->assertSame('media/foo.jpg?v=00000000', (string) $asset);
     }
 
-    public function testImageHelperReturnsImagePathForGivenName()
+    public function testAssetHelperReturnsAssetPathForGivenName()
     {
+        $this->file('_media/foo.jpg');
+
         Render::share('routeKey', 'foo');
-        $this->assertSame('media/foo.jpg', Hyde::asset('foo.jpg'));
-        $this->assertSame('https://example.com/foo.jpg', Hyde::asset('https://example.com/foo.jpg'));
+        $this->assertSame('media/foo.jpg?v=00000000', (string) Hyde::asset('foo.jpg'));
 
         Render::share('routeKey', 'foo/bar');
-        $this->assertSame('../media/foo.jpg', Hyde::asset('foo.jpg'));
-        $this->assertSame('https://example.com/foo.jpg', Hyde::asset('https://example.com/foo.jpg'));
+        $this->assertSame('../media/foo.jpg?v=00000000', (string) Hyde::asset('foo.jpg'));
     }
 
-    public function testImageHelperTrimsMediaPrefix()
+    public function testAssetHelperTrimsMediaPrefix()
     {
-        $this->assertSame('media/foo.jpg', Hyde::asset('media/foo.jpg'));
+        $this->markTestSkipped('needs to reimplement normalization on the get method');
+        $this->file('_media/foo.jpg');
+
+        $this->assertSame('media/foo.jpg?v=00000000', (string) Hyde::asset('media/foo.jpg'));
     }
 
-    public function testImageHelperSupportsCustomMediaDirectories()
+    public function testAssetHelperSupportsCustomMediaDirectories()
     {
+        $this->file('_assets/foo.jpg');
+
         Hyde::setMediaDirectory('_assets');
-        $this->assertSame('assets/foo.jpg', Hyde::asset('foo.jpg'));
+        $this->assertSame('assets/foo.jpg?v=00000000', (string) Hyde::asset('foo.jpg'));
+    }
+
+    public function testAssetHelperWithoutCacheBusting()
+    {
+        $this->file('_media/foo.jpg');
+
+        Config::set('hyde.cache_busting', false);
+
+        $this->assertSame('media/foo.jpg', (string) Hyde::asset('foo.jpg'));
+    }
+
+    public function testAssetHelperWithoutCacheBustingWithChangedSettingInTheSameLifecycle()
+    {
+        $this->file('_media/foo.jpg');
+
+        $this->assertSame('media/foo.jpg?v=00000000', (string) Hyde::asset('foo.jpg'));
+
+        Config::set('hyde.cache_busting', false);
+
+        $this->assertSame('media/foo.jpg', (string) Hyde::asset('foo.jpg'));
+
+        Config::set('hyde.cache_busting', true);
+
+        $this->assertSame('media/foo.jpg?v=00000000', (string) Hyde::asset('foo.jpg'));
+    }
+
+    public function testAssetHelperWithoutCacheBustingWithChangedSettingInTheSameLifecycleForSameInstance()
+    {
+        $this->file('_media/foo.jpg');
+
+        $instance = Hyde::asset('foo.jpg');
+
+        $this->assertSame('media/foo.jpg?v=00000000', (string) $instance);
+
+        Config::set('hyde.cache_busting', false);
+
+        $this->assertSame('media/foo.jpg', (string) $instance);
+
+        Config::set('hyde.cache_busting', true);
+
+        $this->assertSame('media/foo.jpg?v=00000000', (string) $instance);
+    }
+
+    public function testAssetsHelperGetsAssetsFromKernel()
+    {
+        $this->assertSame(Hyde::kernel()->assets(), Hyde::assets());
+        $this->assertSame(Hyde::asset('app.css'), Hyde::assets()->get('app.css'));
+        $this->assertSame(MediaFile::get('app.css'), Hyde::asset('app.css'));
+    }
+
+    public function testAssetsHelperGetsAllSiteAssets()
+    {
+        $this->assertEquals(new Collection([
+            'app.css' => new MediaFile('_media/app.css'),
+        ]), Hyde::assets());
+    }
+
+    public function testAssetsHelperReturnsAssetCollectionSingleton()
+    {
+        $this->assertSame(Hyde::assets(), Hyde::assets());
     }
 
     public function testRouteHelper()
@@ -262,9 +345,9 @@ public function testFluentModelSourcePathHelpers()
         $this->assertSame(Hyde::path('_pages'), MarkdownPage::path());
         $this->assertSame(Hyde::path('_docs'), DocumentationPage::path());
 
-        $this->assertSame(Hyde::path('_media'), Hyde::mediaPath());
+        $this->assertSame(Hyde::path('_media'), MediaFile::sourcePath());
+        $this->assertSame(Hyde::path('_site/media'), MediaFile::outputPath());
         $this->assertSame(Hyde::path('_site'), Hyde::sitePath());
-        $this->assertSame(Hyde::path('_site/media'), Hyde::siteMediaPath());
     }
 
     public function testPathToRelativeHelperReturnsRelativePathForGivenPath()
@@ -397,25 +480,6 @@ public function testGetMediaOutputDirectoryNameUsesTrimmedVersionOfMediaSourceDi
         $this->assertSame('foo', Hyde::getMediaOutputDirectory());
     }
 
-    public function testCanGetSiteMediaOutputDirectory()
-    {
-        $this->assertSame(Hyde::path('_site/media'), Hyde::siteMediaPath());
-    }
-
-    public function testGetSiteMediaOutputDirectoryUsesTrimmedVersionOfMediaSourceDirectory()
-    {
-        Hyde::setMediaDirectory('_foo');
-        $this->assertSame(Hyde::path('_site/foo'), Hyde::siteMediaPath());
-    }
-
-    public function testGetSiteMediaOutputDirectoryUsesConfiguredSiteOutputDirectory()
-    {
-        Hyde::setOutputDirectory(Hyde::path('foo'));
-        Hyde::setMediaDirectory('bar');
-
-        $this->assertSame(Hyde::path('foo/bar'), Hyde::siteMediaPath());
-    }
-
     public function testMediaOutputDirectoryCanBeChangedInConfiguration()
     {
         $this->assertSame('_media', Hyde::getMediaDirectory());
diff --git a/packages/framework/tests/Feature/HydeServiceProviderTest.php b/packages/framework/tests/Feature/HydeServiceProviderTest.php
index adbd5a04812..e84448db9fa 100644
--- a/packages/framework/tests/Feature/HydeServiceProviderTest.php
+++ b/packages/framework/tests/Feature/HydeServiceProviderTest.php
@@ -10,7 +10,6 @@
 use Illuminate\Contracts\Container\BindingResolutionException;
 use Hyde\Console\ConsoleServiceProvider;
 use Hyde\Framework\HydeServiceProvider;
-use Hyde\Framework\Services\AssetService;
 use Hyde\Framework\Services\BuildTaskService;
 use Hyde\Foundation\HydeCoreExtension;
 use Hyde\Hyde;
@@ -55,13 +54,6 @@ public function testProviderHasBootMethod()
         $this->assertTrue(method_exists($this->provider, 'boot'));
     }
 
-    public function testProviderRegistersAssetServiceAsSingleton()
-    {
-        $this->assertTrue($this->app->bound(AssetService::class));
-        $this->assertInstanceOf(AssetService::class, $this->app->make(AssetService::class));
-        $this->assertSame($this->app->make(AssetService::class), $this->app->make(AssetService::class));
-    }
-
     public function testProviderRegistersBuildTaskServiceAsSingleton()
     {
         $this->assertTrue($this->app->bound(BuildTaskService::class));
diff --git a/packages/framework/tests/Feature/MarkdownPostTest.php b/packages/framework/tests/Feature/MarkdownPostTest.php
index 847562dda91..cc4109d85fa 100644
--- a/packages/framework/tests/Feature/MarkdownPostTest.php
+++ b/packages/framework/tests/Feature/MarkdownPostTest.php
@@ -8,6 +8,7 @@
 use Hyde\Pages\BladePage;
 use Hyde\Facades\Filesystem;
 use Hyde\Framework\Actions\StaticPageBuilder;
+use Hyde\Framework\Exceptions\FileNotFoundException;
 use Hyde\Framework\Features\Blogging\Models\FeaturedImage;
 use Hyde\Framework\Features\Blogging\Models\PostAuthor;
 use Hyde\Markdown\Models\FrontMatter;
@@ -106,14 +107,28 @@ public function testFeaturedImageCanBeConstructedReturnsNullWhenNoImageIsSetInTh
 
     public function testFeaturedImageCanBeConstructedReturnsImageObjectWithLocalPathWhenMatterIsString()
     {
+        $this->setupMediaFileAndCacheBusting();
+
         $page = MarkdownPost::make(matter: ['image' => 'foo.png']);
         $image = $page->image;
         $this->assertInstanceOf(FeaturedImage::class, $image);
         $this->assertSame('media/foo.png', $image->getSource());
     }
 
+    public function testFeaturedImageCanBeConstructedReturnsImageObjectWithLocalPathAndCacheBusting()
+    {
+        $this->setupMediaFileAndCacheBusting(true);
+
+        $page = MarkdownPost::make(matter: ['image' => 'foo.png']);
+        $image = $page->image;
+        $this->assertInstanceOf(FeaturedImage::class, $image);
+        $this->assertSame('media/foo.png?v=98b41d87', $image->getSource());
+    }
+
     public function testFeaturedImageCanBeConstructedReturnsImageObjectWithRemotePathWhenMatterIsString()
     {
+        $this->setupMediaFileAndCacheBusting(true);
+
         $page = MarkdownPost::make(matter: ['image' => 'https://example.com/foo.png']);
         $image = $page->image;
         $this->assertInstanceOf(FeaturedImage::class, $image);
@@ -122,6 +137,7 @@ public function testFeaturedImageCanBeConstructedReturnsImageObjectWithRemotePat
 
     public function testFeaturedImageCanBeConstructedReturnsImageObjectWithSuppliedDataWhenMatterIsArray()
     {
+        $this->setupMediaFileAndCacheBusting();
         $page = MarkdownPost::make(matter: ['image' => ['source' => 'foo.png', 'titleText' => 'bar']]);
         $image = $page->image;
         $this->assertInstanceOf(FeaturedImage::class, $image);
@@ -129,6 +145,23 @@ public function testFeaturedImageCanBeConstructedReturnsImageObjectWithSuppliedD
         $this->assertSame('bar', $image->getTitleText());
     }
 
+    public function testFeaturedImageThrowsExceptionWhenFileDoesNotExist()
+    {
+        $this->expectException(FileNotFoundException::class);
+        $this->expectExceptionMessage('File [_media/nonexistent.png] not found when trying to resolve a media asset.');
+
+        MarkdownPost::make(matter: ['image' => 'nonexistent.png']);
+    }
+
+    public function testFeaturedImageNormalizesPathForDifferentMediaDirectoryConfigurations()
+    {
+        Hyde::setMediaDirectory('assets');
+        $this->file('assets/foo.png', 'test content');
+
+        $page = MarkdownPost::make(matter: ['image' => 'foo.png']);
+        $this->assertSame('assets/foo.png?v=98b41d87', $page->image->getSource());
+    }
+
     public function testBlogPostCanBeCreatedWithoutFrontMatter()
     {
         file_put_contents(Hyde::path('_posts/test-post.md'), '# My New Post');
@@ -158,4 +191,10 @@ public function testBlogPostFeedCanBeRenderedWhenPostHasNoFrontMatter()
         Filesystem::unlink('_pages/feed-test.blade.php');
         Filesystem::unlink('_site/feed-test.html');
     }
+
+    protected function setupMediaFileAndCacheBusting(bool $enableCacheBusting = false): void
+    {
+        $this->file('_media/foo.png', 'test content');
+        config(['hyde.cache_busting' => $enableCacheBusting]);
+    }
 }
diff --git a/packages/framework/tests/Feature/MetadataTest.php b/packages/framework/tests/Feature/MetadataTest.php
index fe6d93b724e..e1220f8fbe2 100644
--- a/packages/framework/tests/Feature/MetadataTest.php
+++ b/packages/framework/tests/Feature/MetadataTest.php
@@ -411,101 +411,129 @@ public function testDoesNotAddPublishedTimePropertyWhenDateIsNotSetInPost()
         $this->assertPageDoesNotHaveMetadata($page, '<meta property="og:article:published_time"');
     }
 
-    public function testAddsImagePropertyWhenImageIsSetInPost()
+    public function testAddsTypePropertyAutomatically()
     {
-        $page = new MarkdownPost(matter: ['image' => 'image.jpg']);
+        $page = new MarkdownPost();
 
-        $this->assertPageHasMetadata($page, '<meta property="og:image" content="../media/image.jpg">');
+        $this->assertPageHasMetadata($page, '<meta property="og:type" content="article">');
     }
 
-    public function testDoesNotAddImagePropertyWhenImageIsNotSetInPost()
+    public function testDynamicPostMetaPropertiesReturnsBaseArrayWhenInitializedWithEmptyFrontMatter()
     {
         $page = new MarkdownPost();
-        $this->assertPageDoesNotHaveMetadata($page, '<meta property="og:image"');
+
+        $this->assertSame('<meta property="og:type" content="article">', $page->metadata->render());
     }
 
-    public function testAddsTypePropertyAutomatically()
+    public function testDoesNotAddImagePropertyWhenImageIsNotSetInPost()
     {
         $page = new MarkdownPost();
-
-        $this->assertPageHasMetadata($page, '<meta property="og:type" content="article">');
+        $this->assertPageDoesNotHaveMetadata($page, '<meta property="og:image"');
     }
 
-    public function testDynamicPostMetaPropertiesReturnsBaseArrayWhenInitializedWithEmptyFrontMatter()
+    public function testAddsImagePropertyWhenImageIsSetInPost()
     {
-        $page = new MarkdownPost();
+        $this->file('_media/image.jpg');
+        $page = new MarkdownPost(matter: ['image' => 'image.jpg']);
 
-        $this->assertSame('<meta property="og:type" content="article">', $page->metadata->render());
+        $this->assertPageHasMetadata($page, '<meta property="og:image" content="../media/image.jpg?v=00000000">');
     }
 
     public function testDynamicPostMetaPropertiesContainsImageMetadataWhenFeaturedImageSetToString()
     {
+        $this->file('_media/foo.jpg');
+
         $page = new MarkdownPost(matter: [
             'image' => 'foo.jpg',
         ]);
 
-        $this->assertPageHasMetadata($page, '<meta property="og:image" content="../media/foo.jpg">');
+        $this->assertPageHasMetadata($page, '<meta property="og:image" content="../media/foo.jpg?v=00000000">');
     }
 
     public function testDynamicPostMetaPropertiesContainsImageLinkThatIsAlwaysRelative()
     {
+        $this->file('_media/foo.jpg');
+
         $page = new MarkdownPost(matter: [
             'image' => 'foo.jpg',
         ]);
 
-        $this->assertPageHasMetadata($page, '<meta property="og:image" content="../media/foo.jpg">');
+        $this->assertPageHasMetadata($page, '<meta property="og:image" content="../media/foo.jpg?v=00000000">');
     }
 
     public function testDynamicPostMetaPropertiesContainsImageLinkThatIsAlwaysRelativeForNestedPosts()
     {
+        $this->file('_media/foo.jpg');
+
         $page = new MarkdownPost('foo/bar', matter: [
             'image' => 'foo.jpg',
         ]);
 
-        $this->assertPageHasMetadata($page, '<meta property="og:image" content="../../media/foo.jpg">');
+        $this->assertPageHasMetadata($page, '<meta property="og:image" content="../../media/foo.jpg?v=00000000">');
     }
 
     public function testDynamicPostMetaPropertiesContainsImageLinkThatIsAlwaysRelativeForNestedOutputDirectories()
     {
         MarkdownPost::setOutputDirectory('_posts/foo');
 
+        $this->file('_media/foo.jpg');
+
         $page = new MarkdownPost(matter: [
             'image' => 'foo.jpg',
         ]);
 
-        $this->assertPageHasMetadata($page, '<meta property="og:image" content="../../media/foo.jpg">');
+        $this->assertPageHasMetadata($page, '<meta property="og:image" content="../../media/foo.jpg?v=00000000">');
     }
 
     public function testDynamicPostMetaPropertiesContainsImageLinkThatIsAlwaysRelativeForNestedPostsAndNestedOutputDirectories()
     {
         MarkdownPost::setOutputDirectory('_posts/foo');
 
+        $this->file('_media/foo.jpg');
+
         $page = new MarkdownPost('bar/baz', matter: [
             'image' => 'foo.jpg',
         ]);
 
-        $this->assertPageHasMetadata($page, '<meta property="og:image" content="../../../media/foo.jpg">');
+        $this->assertPageHasMetadata($page, '<meta property="og:image" content="../../../media/foo.jpg?v=00000000">');
     }
 
     public function testDynamicPostMetaPropertiesContainsImageLinkThatUsesTheConfiguredMediaDirectory()
     {
         Hyde::setMediaDirectory('assets');
 
+        $this->file('assets/foo.jpg');
+
         $page = new MarkdownPost(matter: [
             'image' => 'foo.jpg',
         ]);
 
-        $this->assertPageHasMetadata($page, '<meta property="og:image" content="../assets/foo.jpg">');
+        $this->assertPageHasMetadata($page, '<meta property="og:image" content="../assets/foo.jpg?v=00000000">');
     }
 
     public function testDynamicPostMetaPropertiesContainsImageMetadataWhenFeaturedImageSetToArrayWithPath()
     {
+        $this->file('_media/foo.jpg');
+
         $page = new MarkdownPost(matter: [
             'image' => [
                 'source' => 'foo.jpg',
             ],
         ]);
 
+        $this->assertPageHasMetadata($page, '<meta property="og:image" content="../media/foo.jpg?v=00000000">');
+    }
+
+    public function testDynamicPostMetaPropertiesContainsImageLinkWithoutCacheBusting()
+    {
+        config(['hyde.cache_busting' => false]);
+
+        $this->file('_media/foo.jpg');
+
+        $page = new MarkdownPost(matter: [
+            'image' => 'foo.jpg',
+        ]);
+
         $this->assertPageHasMetadata($page, '<meta property="og:image" content="../media/foo.jpg">');
     }
 
diff --git a/packages/framework/tests/Feature/Services/Markdown/DynamicMarkdownLinkProcessorTest.php b/packages/framework/tests/Feature/Services/Markdown/DynamicMarkdownLinkProcessorTest.php
index f658a95a57e..a0736900cb2 100644
--- a/packages/framework/tests/Feature/Services/Markdown/DynamicMarkdownLinkProcessorTest.php
+++ b/packages/framework/tests/Feature/Services/Markdown/DynamicMarkdownLinkProcessorTest.php
@@ -33,6 +33,8 @@ protected function setUp(): void
         Routes::addRoute(new Route(new MarkdownPost('post')));
 
         // Todo: No way to mock media files, so we are using app.css as a test asset for now.
+
+        self::mockConfig(['hyde.cache_busting' => false]);
     }
 
     public function testRouteReplacement()
diff --git a/packages/framework/tests/Feature/Services/Markdown/ShortcodeProcessorTest.php b/packages/framework/tests/Feature/Services/Markdown/ShortcodeProcessorTest.php
index 12660727644..20aac354cdc 100644
--- a/packages/framework/tests/Feature/Services/Markdown/ShortcodeProcessorTest.php
+++ b/packages/framework/tests/Feature/Services/Markdown/ShortcodeProcessorTest.php
@@ -13,6 +13,14 @@
  */
 class ShortcodeProcessorTest extends UnitTestCase
 {
+    protected static bool $needsKernel = true;
+    protected static bool $needsConfig = true;
+
+    protected function setUp(): void
+    {
+        self::mockCurrentRouteKey('foo');
+    }
+
     public function testConstructorDiscoversDefaultShortcodes()
     {
         $shortcodes = (new ShortcodeProcessor('foo'))->getShortcodes();
diff --git a/packages/framework/tests/Feature/Services/RssFeedServiceTest.php b/packages/framework/tests/Feature/Services/RssFeedServiceTest.php
index e8ca9f8d518..72f291eaaa4 100644
--- a/packages/framework/tests/Feature/Services/RssFeedServiceTest.php
+++ b/packages/framework/tests/Feature/Services/RssFeedServiceTest.php
@@ -86,6 +86,8 @@ public function testXmlChannelDataCanBeCustomized()
 
     public function testMarkdownBlogPostsAreAddedToRssFeedThroughAutodiscovery()
     {
+        config(['hyde.cache_busting' => false]);
+
         file_put_contents(Hyde::path('_posts/rss.md'), <<<'MD'
             ---
             title: RSS
diff --git a/packages/framework/tests/Feature/StaticSiteBuilderPostModuleTest.php b/packages/framework/tests/Feature/StaticSiteBuilderPostModuleTest.php
index 18f4743ecdb..8269e519dc1 100644
--- a/packages/framework/tests/Feature/StaticSiteBuilderPostModuleTest.php
+++ b/packages/framework/tests/Feature/StaticSiteBuilderPostModuleTest.php
@@ -23,6 +23,8 @@ protected function setUp(): void
     {
         parent::setUp();
 
+        $this->file('_media/image.png');
+
         $this->post = MarkdownPost::make('test-post', [
             'title' => 'Adventures in Wonderland',
             'description' => 'All in the golden afternoon, full leisurely we glide.',
@@ -119,9 +121,9 @@ public function testPostContainsExpectedAriaSupport()
     public function testPostImageIsResolvedRelatively()
     {
         $this->inspectHtml([
-            '<meta property="og:image" content="../media/image.png">',
-            '<meta itemprop="url" content="../media/image.png">',
-            '<meta itemprop="contentUrl" content="../media/image.png">',
+            '<meta property="og:image" content="../media/image.png?v=00000000">',
+            '<meta itemprop="url" content="../media/image.png?v=00000000">',
+            '<meta itemprop="contentUrl" content="../media/image.png?v=00000000">',
         ]);
     }
 
diff --git a/packages/framework/tests/Feature/StaticSiteServiceTest.php b/packages/framework/tests/Feature/StaticSiteServiceTest.php
index 8c740d851c5..580139033ba 100644
--- a/packages/framework/tests/Feature/StaticSiteServiceTest.php
+++ b/packages/framework/tests/Feature/StaticSiteServiceTest.php
@@ -18,6 +18,7 @@
  * @covers \Hyde\Console\Commands\BuildSiteCommand
  * @covers \Hyde\Framework\Services\BuildService
  * @covers \Hyde\Framework\Actions\PreBuildTasks\CleanSiteDirectory
+ * @covers \Hyde\Framework\Actions\PreBuildTasks\TransferMediaAssets
  */
 class StaticSiteServiceTest extends TestCase
 {
@@ -59,10 +60,12 @@ public function testBuildCommandCreatesHtmlFiles()
 
     public function testBuildCommandTransfersMediaAssetFiles()
     {
-        file_put_contents(Hyde::path('_media/test-image.png'), 'foo');
-        $this->artisan('build');
+        $this->file('_media/test-image.png', 'foo');
+        $this->artisan('build')
+            ->expectsOutputToContain('Transferring Media Assets...');
+
         $this->assertFileEquals(Hyde::path('_media/test-image.png'), Hyde::path('_site/media/test-image.png'));
-        Filesystem::unlink('_media/test-image.png');
+
         Filesystem::unlink('_site/media/test-image.png');
     }
 
@@ -70,11 +73,41 @@ public function testBuildCommandTransfersMediaAssetFilesRecursively()
     {
         $this->directory('_media/foo');
 
-        file_put_contents(Hyde::path('_media/foo/img.png'), 'foo');
+        $this->file('_media/foo/img.png', 'foo');
         $this->artisan('build')->assertSuccessful();
         $this->assertFileEquals(Hyde::path('_media/foo/img.png'), Hyde::path('_site/media/foo/img.png'));
     }
 
+    public function testBuildCommandCreatesNeededMediaDirectoriesRecursively()
+    {
+        $this->directory('_media/foo/bar');
+        $this->file('_media/1.png');
+        $this->file('_media/foo/2.png');
+        $this->file('_media/foo/bar/3.png');
+
+        Filesystem::deleteDirectory('_site');
+
+        $this->artisan('build')
+            ->assertExitCode(0);
+
+        $this->assertFileExists(Hyde::path('_site/media/1.png'));
+        $this->assertFileExists(Hyde::path('_site/media/foo/2.png'));
+        $this->assertFileExists(Hyde::path('_site/media/foo/bar/3.png'));
+    }
+
+    public function testBuildCommandSkipsMediaTransferWhenThereAreNoAssets()
+    {
+        rename(Hyde::path('_media/app.css'), Hyde::path('_media/app.css.bak'));
+
+        $this->artisan('build')
+            ->expectsOutputToContain('Transferring Media Assets... ')
+            ->expectsOutputToContain('Skipped')
+            ->expectsOutputToContain('> No media files to transfer.')
+            ->assertExitCode(0);
+
+        rename(Hyde::path('_media/app.css.bak'), Hyde::path('_media/app.css'));
+    }
+
     public function testAllPageTypesCanBeCompiled()
     {
         $this->file('_pages/html.html');
@@ -96,12 +129,6 @@ public function testAllPageTypesCanBeCompiled()
         $this->assertFileExists(Hyde::path('_site/markdown.html'));
         $this->assertFileExists(Hyde::path('_site/posts/post.html'));
         $this->assertFileExists(Hyde::path('_site/docs/docs.html'));
-
-        Filesystem::unlink('_site/html.html');
-        Filesystem::unlink('_site/blade.html');
-        Filesystem::unlink('_site/markdown.html');
-        Filesystem::unlink('_site/posts/post.html');
-        Filesystem::unlink('_site/docs/docs.html');
     }
 
     public function testOnlyProgressBarsForTypesWithPagesAreShown()
@@ -120,8 +147,6 @@ public function testOnlyProgressBarsForTypesWithPagesAreShown()
 
         $this->assertFileExists(Hyde::path('_site/blade.html'));
         $this->assertFileExists(Hyde::path('_site/markdown.html'));
-        Filesystem::unlink('_site/blade.html');
-        Filesystem::unlink('_site/markdown.html');
     }
 
     public function testPrintInitialInformationAllowsApiToBeDisabled()
diff --git a/packages/framework/tests/Feature/Support/MediaFileTest.php b/packages/framework/tests/Feature/Support/MediaFileTest.php
index 0782bfaf3bc..9ed44ccd8e8 100644
--- a/packages/framework/tests/Feature/Support/MediaFileTest.php
+++ b/packages/framework/tests/Feature/Support/MediaFileTest.php
@@ -4,200 +4,161 @@
 
 namespace Hyde\Framework\Testing\Feature\Support;
 
-use Hyde\Facades\Filesystem;
-use Hyde\Framework\Exceptions\FileNotFoundException;
 use Hyde\Hyde;
-use Hyde\Support\Filesystem\MediaFile;
 use Hyde\Testing\TestCase;
+use Illuminate\Support\Str;
+use Hyde\Support\Filesystem\MediaFile;
+use Hyde\Framework\Exceptions\FileNotFoundException;
 
 /**
  * @covers \Hyde\Support\Filesystem\MediaFile
+ *
+ * @see \Hyde\Framework\Testing\Unit\Support\MediaFileUnitTest
  */
 class MediaFileTest extends TestCase
 {
-    public function testCanConstruct()
+    public function testMediaFileCreationAndBasicProperties()
     {
-        $file = new MediaFile('foo');
+        $this->file('_media/test.txt', 'Hello, World!');
 
-        $this->assertInstanceOf(MediaFile::class, $file);
-        $this->assertSame('foo', $file->path);
-    }
+        $mediaFile = MediaFile::make('test.txt');
 
-    public function testCanMake()
-    {
-        $this->assertEquals(new MediaFile('foo'), MediaFile::make('foo'));
-    }
+        $this->assertInstanceOf(MediaFile::class, $mediaFile);
+        $this->assertSame('test.txt', $mediaFile->getName());
+        $this->assertSame('_media/test.txt', $mediaFile->getPath());
+        $this->assertSame(Hyde::path('_media/test.txt'), $mediaFile->getAbsolutePath());
+        $this->assertSame('Hello, World!', $mediaFile->getContents());
+        $this->assertSame('txt', $mediaFile->getExtension());
 
-    public function testCanConstructWithNestedPaths()
-    {
-        $this->assertSame('path/to/file.txt', MediaFile::make('path/to/file.txt')->path);
+        $this->assertSame([
+            'name' => 'test.txt',
+            'path' => '_media/test.txt',
+            'length' => 13,
+            'mimeType' => 'text/plain',
+            'hash' => 'dffed8e6',
+        ], $mediaFile->toArray());
     }
 
-    public function testAbsolutePathIsNormalizedToRelative()
+    public function testMediaFileDiscovery()
     {
-        $this->assertSame('foo', MediaFile::make(Hyde::path('foo'))->path);
-    }
+        // App.css is a default file
+        $this->file('_media/image.png', 'PNG content');
+        $this->file('_media/style.css', 'CSS content');
+        $this->file('_media/script.js', 'JS content');
 
-    public function testGetNameReturnsNameOfFile()
-    {
-        $this->assertSame('foo.txt', MediaFile::make('foo.txt')->getName());
-        $this->assertSame('bar.txt', MediaFile::make('foo/bar.txt')->getName());
-    }
+        $allFiles = MediaFile::all();
 
-    public function testGetPathReturnsPathOfFile()
-    {
-        $this->assertSame('foo.txt', MediaFile::make('foo.txt')->getPath());
-        $this->assertSame('foo/bar.txt', MediaFile::make('foo/bar.txt')->getPath());
-    }
+        $this->assertCount(4, $allFiles);
+        $this->assertArrayHasKey('image.png', $allFiles);
+        $this->assertArrayHasKey('style.css', $allFiles);
+        $this->assertArrayHasKey('script.js', $allFiles);
 
-    public function testGetAbsolutePathReturnsAbsolutePathOfFile()
-    {
-        $this->assertSame(Hyde::path('foo.txt'), MediaFile::make('foo.txt')->getAbsolutePath());
-        $this->assertSame(Hyde::path('foo/bar.txt'), MediaFile::make('foo/bar.txt')->getAbsolutePath());
+        $fileNames = MediaFile::files();
+        $this->assertEqualsCanonicalizing(['image.png', 'app.css', 'style.css', 'script.js'], $fileNames);
     }
 
-    public function testGetContentsReturnsContentsOfFile()
+    public function testMediaFileProperties()
     {
-        $this->file('foo.txt', 'foo bar');
-        $this->assertSame('foo bar', MediaFile::make('foo.txt')->getContents());
-    }
+        $content = str_repeat('a', 1024); // 1KB content
+        $this->file('_media/large_file.txt', $content);
 
-    public function testGetExtensionReturnsExtensionOfFile()
-    {
-        $this->file('foo.txt', 'foo');
-        $this->assertSame('txt', MediaFile::make('foo.txt')->getExtension());
+        $mediaFile = MediaFile::make('large_file.txt');
 
-        $this->file('foo.png', 'foo');
-        $this->assertSame('png', MediaFile::make('foo.png')->getExtension());
+        $this->assertSame(1024, $mediaFile->getLength());
+        $this->assertSame('text/plain', $mediaFile->getMimeType());
+        $this->assertSame(hash('crc32', $content), $mediaFile->getHash());
     }
 
-    public function testToArrayReturnsArrayOfFileProperties()
+    public function testMediaFilePathHandling()
     {
-        $this->file('foo.txt', 'foo bar');
+        $this->file('_media/subfolder/nested_file.txt', 'Nested content');
 
-        $this->assertSame([
-            'name' => 'foo.txt',
-            'path' => 'foo.txt',
-            'length' => 7,
-            'mimeType' => 'text/plain',
-        ], MediaFile::make('foo.txt')->toArray());
+        $mediaFile = MediaFile::make('subfolder/nested_file.txt');
+
+        $this->assertSame('subfolder/nested_file.txt', $mediaFile->getIdentifier());
+        $this->assertSame('_media/subfolder/nested_file.txt', $mediaFile->getPath());
     }
 
-    public function testToArrayWithEmptyFileWithNoExtension()
+    public function testMediaFileExceptionHandling()
     {
-        $this->file('foo', 'foo bar');
-
-        $this->assertSame([
-            'name' => 'foo',
-            'path' => 'foo',
-            'length' => 7,
-            'mimeType' => 'text/plain',
-        ], MediaFile::make('foo')->toArray());
+        $this->expectException(FileNotFoundException::class);
+        MediaFile::make('non_existent_file.txt')->getLength();
     }
 
-    public function testToArrayWithFileInSubdirectory()
+    public function testMediaDirectoryCustomization()
     {
-        mkdir(Hyde::path('foo'));
-        touch(Hyde::path('foo/bar.txt'));
+        Hyde::setMediaDirectory('custom_media');
 
-        $this->assertSame([
-            'name' => 'bar.txt',
-            'path' => 'foo/bar.txt',
-            'length' => 0,
-            'mimeType' => 'text/plain',
-        ], MediaFile::make('foo/bar.txt')->toArray());
+        $this->file('custom_media/custom_file.txt', 'Custom content');
 
-        Filesystem::unlink('foo/bar.txt');
-        rmdir(Hyde::path('foo'));
-    }
+        $mediaFile = MediaFile::make('custom_file.txt');
 
-    public function testGetContentLength()
-    {
-        $this->file('foo', 'Hello World!');
-        $this->assertSame(12, MediaFile::make('foo')->getContentLength());
-    }
+        $this->assertSame('custom_media/custom_file.txt', $mediaFile->getPath());
+        $this->assertSame(Hyde::path('custom_media/custom_file.txt'), $mediaFile->getAbsolutePath());
 
-    public function testGetContentLengthWithEmptyFile()
-    {
-        $this->file('foo', '');
-        $this->assertSame(0, MediaFile::make('foo')->getContentLength());
+        Hyde::setMediaDirectory('_media');
     }
 
-    public function testGetContentLengthWithDirectory()
+    public function testMediaFileOutputPaths()
     {
-        $this->directory('foo');
+        $this->assertSame(Hyde::path('_site/media'), MediaFile::outputPath());
+        $this->assertSame(Hyde::path('_site/media/test.css'), MediaFile::outputPath('test.css'));
 
-        $this->expectException(FileNotFoundException::class);
-        $this->expectExceptionMessage('File [foo] not found.');
+        Hyde::setOutputDirectory('custom_output');
+        $this->assertSame(Hyde::path('custom_output/media'), MediaFile::outputPath());
 
-        MediaFile::make('foo')->getContentLength();
+        Hyde::setOutputDirectory('_site');
     }
 
-    public function testGetContentLengthWithNonExistentFile()
+    public function testMediaFileCacheBusting()
     {
-        $this->expectException(FileNotFoundException::class);
-        $this->expectExceptionMessage('File [foo] not found.');
+        $this->file('_media/cachebust_test.js', 'console.log("Hello");');
 
-        MediaFile::make('foo')->getContentLength();
-    }
+        $cacheBustKey = Str::after(MediaFile::make('cachebust_test.js')->getLink(), '.js');
 
-    public function testGetMimeType()
-    {
-        $this->file('foo.txt', 'Hello World!');
-        $this->assertSame('text/plain', MediaFile::make('foo.txt')->getMimeType());
+        $this->assertStringStartsWith('?v=', $cacheBustKey);
+        $this->assertSame('?v=cd5de5e7', $cacheBustKey); // Expect CRC32 hash
     }
 
-    public function testGetMimeTypeWithoutExtension()
+    public function testGetOutputPath()
     {
-        $this->file('foo', 'Hello World!');
-        $this->assertSame('text/plain', MediaFile::make('foo')->getMimeType());
-    }
+        $this->file('_media/test.txt', 'Hello, World!');
+        $mediaFile = MediaFile::make('test.txt');
 
-    public function testGetMimeTypeWithEmptyFile()
-    {
-        $this->file('foo', '');
-        $this->assertSame('application/x-empty', MediaFile::make('foo')->getMimeType());
+        $expectedPath = Hyde::path('_site/media/test.txt');
+        $this->assertSame($expectedPath, $mediaFile->getOutputPath());
     }
 
-    public function testGetMimeTypeWithDirectory()
+    public function testGetOutputPathWithNestedFile()
     {
-        $this->directory('foo');
-        $this->assertSame('directory', MediaFile::make('foo')->getMimeType());
-    }
+        $this->file('_media/subfolder/nested_file.txt', 'Nested content');
+        $mediaFile = MediaFile::make('subfolder/nested_file.txt');
 
-    public function testGetMimeTypeWithNonExistentFile()
-    {
-        $this->assertSame('text/plain', MediaFile::make('foo')->getMimeType());
+        $expectedPath = Hyde::path('_site/media/subfolder/nested_file.txt');
+        $this->assertSame($expectedPath, $mediaFile->getOutputPath());
     }
 
-    public function testAllHelperReturnsAllMediaFiles()
+    public function testGetOutputPathWithCustomMediaDirectory()
     {
-        $this->assertEquals([
-            'app.css' => new MediaFile('_media/app.css'),
-        ], MediaFile::all());
-    }
+        Hyde::setMediaDirectory('custom_media');
+        $this->file('custom_media/custom_file.txt', 'Custom content');
+        $mediaFile = MediaFile::make('custom_file.txt');
 
-    public function testAllHelperDoesNotIncludeNonMediaFiles()
-    {
-        $this->file('_media/foo.blade.php');
+        $expectedPath = Hyde::path('_site/custom_media/custom_file.txt');
+        $this->assertSame($expectedPath, $mediaFile->getOutputPath());
 
-        $this->assertEquals([
-            'app.css' => new MediaFile('_media/app.css'),
-        ], MediaFile::all());
+        Hyde::setMediaDirectory('_media'); // Reset to default
     }
 
-    public function testFilesHelperReturnsAllMediaFiles()
+    public function testGetOutputPathWithCustomOutputDirectory()
     {
-        $this->assertSame(['app.css'], MediaFile::files());
-    }
+        Hyde::setOutputDirectory('custom_output');
+        $this->file('_media/test.txt', 'Hello, World!');
+        $mediaFile = MediaFile::make('test.txt');
 
-    public function testGetIdentifierReturnsIdentifier()
-    {
-        $this->assertSame('foo', MediaFile::make('foo')->getIdentifier());
-    }
+        $expectedPath = Hyde::path('custom_output/media/test.txt');
+        $this->assertSame($expectedPath, $mediaFile->getOutputPath());
 
-    public function testGetIdentifierWithSubdirectory()
-    {
-        $this->assertSame('foo/bar', MediaFile::make('foo/bar')->getIdentifier());
+        Hyde::setOutputDirectory('_site'); // Reset to default
     }
 }
diff --git a/packages/framework/tests/Feature/Views/MetadataViewTest.php b/packages/framework/tests/Feature/Views/MetadataViewTest.php
index b4424aa18c0..1e517e8e0e1 100644
--- a/packages/framework/tests/Feature/Views/MetadataViewTest.php
+++ b/packages/framework/tests/Feature/Views/MetadataViewTest.php
@@ -26,7 +26,7 @@ protected function setUp(): void
         parent::setUp();
 
         $this->withSiteUrl();
-        config(['hyde.enable_cache_busting' => false]);
+        config(['hyde.cache_busting' => false]);
     }
 
     protected function build(?string $page = null): void
@@ -92,7 +92,7 @@ public function testMetadataTagsInEmptyBladePage()
 
         $assertions = $this->assertSee('test', array_merge($this->getDefaultTags(), [
             '<title>HydePHP - Test</title>',
-            '<link rel="stylesheet" href="media/app.css">',
+            '<link rel="stylesheet" href="https://example.com/media/app.css">',
             '<link rel="canonical" href="https://example.com/test.html">',
             '<meta name="twitter:title" content="HydePHP - Test">',
             '<meta property="og:title" content="HydePHP - Test">',
@@ -108,7 +108,7 @@ public function testMetadataTagsInEmptyMarkdownPage()
 
         $assertions = $this->assertSee('test', array_merge($this->getDefaultTags(), [
             '<title>HydePHP - Test</title>',
-            '<link rel="stylesheet" href="media/app.css">',
+            '<link rel="stylesheet" href="https://example.com/media/app.css">',
             '<link rel="canonical" href="https://example.com/test.html">',
             '<meta name="twitter:title" content="HydePHP - Test">',
             '<meta property="og:title" content="HydePHP - Test">',
@@ -124,7 +124,7 @@ public function testMetadataTagsInEmptyDocumentationPage()
 
         $assertions = $this->assertSee('docs/test', array_merge($this->getDefaultTags(), [
             '<title>HydePHP - Test</title>',
-            '<link rel="stylesheet" href="../media/app.css">',
+            '<link rel="stylesheet" href="https://example.com/media/app.css">',
             '<link rel="canonical" href="https://example.com/docs/test.html">',
             '<meta name="twitter:title" content="HydePHP - Test">',
             '<meta property="og:title" content="HydePHP - Test">',
@@ -141,7 +141,7 @@ public function testMetadataTagsInEmptyMarkdownPost()
         $assertions = $this->assertSee('posts/test', array_merge($this->getDefaultTags(), [
             '<title>HydePHP - Test</title>',
             '<link rel="alternate" href="https://example.com/feed.xml" type="application/rss+xml" title="HydePHP RSS Feed">',
-            '<link rel="stylesheet" href="../media/app.css">',
+            '<link rel="stylesheet" href="https://example.com/media/app.css">',
             '<link rel="canonical" href="https://example.com/posts/test.html">',
             '<meta name="twitter:title" content="HydePHP - Test">',
             '<meta name="url" content="https://example.com/posts/test.html">',
@@ -173,12 +173,13 @@ public function testMetadataTagsInMarkdownPostWithFlatFrontMatter()
             Lorem Ipsum Dolor Amet.
             MARKDOWN
         );
+        $this->file('_media/image.jpg');
         $this->build('_posts/test.md');
 
         $assertions = $this->assertSee('posts/test', array_merge($this->getDefaultTags(), [
             '<title>HydePHP - My title</title>',
             '<link rel="alternate" href="https://example.com/feed.xml" type="application/rss+xml" title="HydePHP RSS Feed">',
-            '<link rel="stylesheet" href="../media/app.css">',
+            '<link rel="stylesheet" href="https://example.com/media/app.css">',
             '<link rel="canonical" href="https://example.com/posts/test.html">',
             '<meta name="twitter:title" content="HydePHP - My title">',
             '<meta name="description" content="My description">',
@@ -190,11 +191,11 @@ public function testMetadataTagsInMarkdownPostWithFlatFrontMatter()
             '<meta property="og:url" content="https://example.com/posts/test.html">',
             '<meta property="og:type" content="article">',
             '<meta property="og:article:published_time" content="2022-01-01T00:00:00+00:00">',
-            '<meta property="og:image" content="../media/image.jpg">',
+            '<meta property="og:image" content="https://example.com/media/image.jpg">',
             '<meta itemprop="identifier" content="test">',
             '<meta itemprop="url" content="https://example.com/posts/test.html">',
-            '<meta itemprop="url" content="../media/image.jpg">',
-            '<meta itemprop="contentUrl" content="../media/image.jpg">',
+            '<meta itemprop="url" content="https://example.com/media/image.jpg">',
+            '<meta itemprop="contentUrl" content="https://example.com/media/image.jpg">',
         ]));
 
         $this->assertAllTagsWereCovered('posts/test', $assertions);
@@ -219,6 +220,7 @@ public function testCanonicalUrlTagsAreNotAddedWhenCanonicalUrlIsNotSet()
             Lorem Ipsum Dolor Amet.
             MARKDOWN
         );
+        $this->file('_media/image.jpg');
         $this->build('_posts/test.md');
 
         $assertions = $this->assertSee('posts/test', [
@@ -285,7 +287,7 @@ public function testMetadataTagsInMarkdownPageWithDescription()
 
         $this->assertSee('test-page', array_merge($this->getDefaultTags(), [
             '<title>HydePHP - My Page Title</title>',
-            '<link rel="stylesheet" href="media/app.css">',
+            '<link rel="stylesheet" href="https://example.com/media/app.css">',
             '<meta name="twitter:title" content="HydePHP - My Page Title">',
             '<meta property="og:title" content="HydePHP - My Page Title">',
             '<meta property="og:description" content="My page description">',
diff --git a/packages/framework/tests/Unit/AssetServiceUnitTest.php b/packages/framework/tests/Unit/AssetServiceUnitTest.php
deleted file mode 100644
index 4554ec53df0..00000000000
--- a/packages/framework/tests/Unit/AssetServiceUnitTest.php
+++ /dev/null
@@ -1,119 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Hyde\Framework\Testing\Unit;
-
-use Hyde\Framework\Services\AssetService;
-use Hyde\Testing\UnitTestCase;
-use Hyde\Hyde;
-
-/**
- * @covers \Hyde\Framework\Services\AssetService
- *
- * @see \Hyde\Framework\Testing\Feature\AssetServiceTest
- */
-class AssetServiceUnitTest extends UnitTestCase
-{
-    protected function setUp(): void
-    {
-        self::resetKernel();
-        self::mockConfig();
-    }
-
-    public function testVersionStringConstant()
-    {
-        $this->assertSame('v3.4', AssetService::HYDEFRONT_VERSION);
-    }
-
-    public function testServiceHasVersionString()
-    {
-        $this->assertIsString((new AssetService())->version());
-    }
-
-    public function testVersionStringDefaultsToConstant()
-    {
-        $this->assertSame(AssetService::HYDEFRONT_VERSION, (new AssetService())->version());
-    }
-
-    public function testVersionCanBeSetInConfig()
-    {
-        self::mockConfig(['hyde.hydefront_version' => '1.0.0']);
-        $this->assertSame('1.0.0', (new AssetService())->version());
-    }
-
-    public function testCdnPatternConstant()
-    {
-        $this->assertSame('https://cdn.jsdelivr.net/npm/hydefront@{{ $version }}/dist/{{ $file }}', AssetService::HYDEFRONT_CDN_URL);
-    }
-
-    public function testCanSetCustomCdnUrlInConfig()
-    {
-        self::mockConfig(['hyde.hydefront_url' => 'https://example.com']);
-        $this->assertSame('https://example.com', (new AssetService())->cdnLink(''));
-    }
-
-    public function testCanUseCustomCdnUrlWithVersion()
-    {
-        self::mockConfig(['hyde.hydefront_url' => '{{ $version }}']);
-        $this->assertSame('v3.4', (new AssetService())->cdnLink(''));
-    }
-
-    public function testCanUseCustomCdnUrlWithFile()
-    {
-        self::mockConfig(['hyde.hydefront_url' => '{{ $file }}']);
-        $this->assertSame('styles.css', (new AssetService())->cdnLink('styles.css'));
-    }
-
-    public function testCanUseCustomCdnUrlWithVersionAndFile()
-    {
-        self::mockConfig(['hyde.hydefront_url' => '{{ $version }}/{{ $file }}']);
-        $this->assertSame('v3.4/styles.css', (new AssetService())->cdnLink('styles.css'));
-    }
-
-    public function testCanUseCustomCdnUrlWithCustomVersion()
-    {
-        self::mockConfig([
-            'hyde.hydefront_url' => '{{ $version }}',
-            'hyde.hydefront_version' => '1.0.0',
-        ]);
-        $this->assertSame('1.0.0', (new AssetService())->cdnLink(''));
-    }
-
-    public function testCdnLinkHelper()
-    {
-        $this->assertSame(
-            'https://cdn.jsdelivr.net/npm/hydefront@v3.4/dist/styles.css',
-            (new AssetService())->cdnLink('styles.css')
-        );
-    }
-
-    public function testHasMediaFileHelper()
-    {
-        $this->assertFalse((new AssetService())->hasMediaFile('styles.css'));
-    }
-
-    public function testHasMediaFileHelperReturnsTrueForExistingFile()
-    {
-        $this->assertTrue((new AssetService())->hasMediaFile('app.css'));
-    }
-
-    public function testInjectTailwindConfigReturnsExtractedTailwindConfig()
-    {
-        $service = new AssetService();
-        $this->assertIsString($config = $service->injectTailwindConfig());
-        $this->assertStringContainsString("darkMode: 'class'", $config);
-        $this->assertStringContainsString('theme: {', $config);
-        $this->assertStringContainsString('extend: {', $config);
-        $this->assertStringContainsString('typography: {', $config);
-        $this->assertStringNotContainsString('plugins', $config);
-    }
-
-    public function testInjectTailwindConfigHandlesMissingConfigFileGracefully()
-    {
-        rename(Hyde::path('tailwind.config.js'), Hyde::path('tailwind.config.js.bak'));
-        $this->assertIsString((new AssetService())->injectTailwindConfig());
-        $this->assertSame('', (new AssetService())->injectTailwindConfig());
-        rename(Hyde::path('tailwind.config.js.bak'), Hyde::path('tailwind.config.js'));
-    }
-}
diff --git a/packages/framework/tests/Unit/Facades/AssetFacadeTest.php b/packages/framework/tests/Unit/Facades/AssetFacadeTest.php
deleted file mode 100644
index a3e504c2c19..00000000000
--- a/packages/framework/tests/Unit/Facades/AssetFacadeTest.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Hyde\Framework\Testing\Unit\Facades;
-
-use Hyde\Facades\Asset;
-use Hyde\Testing\UnitTestCase;
-use Hyde\Testing\CreatesApplication;
-use Hyde\Framework\Services\AssetService;
-
-/**
- * @covers \Hyde\Facades\Asset
- */
-class AssetFacadeTest extends UnitTestCase
-{
-    use CreatesApplication;
-
-    protected function setUp(): void
-    {
-        $this->createApplication();
-    }
-
-    public function testAssetFacadeReturnsTheAssetService()
-    {
-        $this->assertInstanceOf(AssetService::class, Asset::getFacadeRoot());
-    }
-
-    public function testFacadeReturnsSameInstanceAsBoundByTheContainer()
-    {
-        $this->assertSame(Asset::getFacadeRoot(), app(AssetService::class));
-    }
-
-    public function testAssetFacadeCanCallMethodsOnTheAssetService()
-    {
-        $service = new AssetService();
-        $this->assertEquals($service->version(), Asset::version());
-    }
-}
diff --git a/packages/framework/tests/Unit/Facades/AssetFacadeUnitTest.php b/packages/framework/tests/Unit/Facades/AssetFacadeUnitTest.php
new file mode 100644
index 00000000000..da5b1573138
--- /dev/null
+++ b/packages/framework/tests/Unit/Facades/AssetFacadeUnitTest.php
@@ -0,0 +1,63 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Hyde\Framework\Testing\Unit\Facades;
+
+use Hyde\Hyde;
+use Hyde\Facades\Asset;
+use Hyde\Testing\UnitTestCase;
+use Hyde\Support\Facades\Render;
+use Hyde\Support\Models\RenderData;
+use Hyde\Framework\Exceptions\FileNotFoundException;
+
+/**
+ * @covers \Hyde\Facades\Asset
+ */
+class AssetFacadeUnitTest extends UnitTestCase
+{
+    protected function setUp(): void
+    {
+        self::setupKernel();
+        self::mockConfig();
+
+        Render::swap(new RenderData());
+    }
+
+    public function testGetHelper()
+    {
+        $this->assertSame(Hyde::asset('app.css'), Asset::get('app.css'));
+    }
+
+    public function testGetHelperWithNonExistentFile()
+    {
+        $this->expectException(FileNotFoundException::class);
+        Asset::get('styles.css');
+    }
+
+    public function testHasMediaFileHelper()
+    {
+        $this->assertFalse(Asset::exists('styles.css'));
+    }
+
+    public function testHasMediaFileHelperReturnsTrueForExistingFile()
+    {
+        $this->assertTrue(Asset::exists('app.css'));
+    }
+
+    public function testAssetReturnsMediaPathWithCacheKey()
+    {
+        $this->assertIsString($path = (string) Asset::get('app.css'));
+        $this->assertSame('media/app.css?v='.hash_file('crc32', Hyde::path('_media/app.css')), $path);
+    }
+
+    public function testAssetReturnsMediaPathWithoutCacheKeyIfCacheBustingIsDisabled()
+    {
+        self::mockConfig(['hyde.cache_busting' => false]);
+
+        $path = (string) Asset::get('app.css');
+
+        $this->assertIsString($path);
+        $this->assertSame('media/app.css', $path);
+    }
+}
diff --git a/packages/framework/tests/Unit/Facades/HydeFrontFacadeTest.php b/packages/framework/tests/Unit/Facades/HydeFrontFacadeTest.php
new file mode 100644
index 00000000000..2ac04884afe
--- /dev/null
+++ b/packages/framework/tests/Unit/Facades/HydeFrontFacadeTest.php
@@ -0,0 +1,73 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Hyde\Framework\Testing\Unit\Facades;
+
+use Hyde\Hyde;
+use Hyde\Facades\HydeFront;
+use Hyde\Testing\UnitTestCase;
+
+/**
+ * @covers \Hyde\Facades\HydeFront
+ */
+class HydeFrontFacadeTest extends UnitTestCase
+{
+    protected static bool $needsKernel = true;
+
+    public function testVersionReturnsCorrectHydeFrontVersion()
+    {
+        if (file_exists(Hyde::path('README.md')) && ! str_contains(file_get_contents(Hyde::path('README.md')), 'HydePHP - Source Code Monorepo')) {
+            $this->markTestSkipped('Test skipped when not running in the monorepo.');
+        }
+
+        $package = json_decode(file_get_contents(Hyde::path('packages/hydefront/package.json')), true);
+
+        [$major, $minor] = explode('.', $package['version']);
+
+        $this->assertSame("v$major.$minor", HydeFront::version());
+    }
+
+    public function testVersionReturnsString()
+    {
+        $this->assertIsString(HydeFront::version());
+    }
+
+    public function testCdnLinkReturnsCorrectUrl()
+    {
+        $expected = 'https://cdn.jsdelivr.net/npm/hydefront@v3.4/dist/styles.css';
+        $this->assertSame($expected, HydeFront::cdnLink('styles.css'));
+    }
+
+    public function testCdnLinkReturnsCorrectUrlForHydeCss()
+    {
+        $expected = 'https://cdn.jsdelivr.net/npm/hydefront@v3.4/dist/hyde.css';
+        $this->assertSame($expected, HydeFront::cdnLink('hyde.css'));
+    }
+
+    public function testCdnLinkReturnsCorrectUrlForInvalidFile()
+    {
+        $expected = 'https://cdn.jsdelivr.net/npm/hydefront@v3.4/dist/invalid';
+        $this->assertSame($expected, HydeFront::cdnLink('invalid'));
+    }
+
+    public function testInjectTailwindConfigReturnsExtractedTailwindConfig()
+    {
+        $config = HydeFront::injectTailwindConfig();
+
+        $this->assertIsString($config);
+        $this->assertStringContainsString("darkMode: 'class'", $config);
+        $this->assertStringContainsString('theme: {', $config);
+        $this->assertStringContainsString('extend: {', $config);
+        $this->assertStringContainsString('typography: {', $config);
+        $this->assertStringNotContainsString('plugins', $config);
+    }
+
+    public function testInjectTailwindConfigHandlesMissingConfigFileGracefully()
+    {
+        rename(Hyde::path('tailwind.config.js'), Hyde::path('tailwind.config.js.bak'));
+        $this->assertIsString(HydeFront::injectTailwindConfig());
+        $this->assertSame('', HydeFront::injectTailwindConfig());
+        rename(Hyde::path('tailwind.config.js.bak'), Hyde::path('tailwind.config.js'));
+    }
+}
diff --git a/packages/framework/tests/Unit/FeaturedImageUnitTest.php b/packages/framework/tests/Unit/FeaturedImageUnitTest.php
index 5ea286739a7..26ab3ffca70 100644
--- a/packages/framework/tests/Unit/FeaturedImageUnitTest.php
+++ b/packages/framework/tests/Unit/FeaturedImageUnitTest.php
@@ -4,6 +4,8 @@
 
 namespace Hyde\Framework\Testing\Unit;
 
+use Hyde\Foundation\HydeKernel;
+use Illuminate\Support\Collection;
 use Hyde\Framework\Exceptions\FileNotFoundException;
 use Hyde\Framework\Features\Blogging\Models\FeaturedImage;
 use Hyde\Testing\UnitTestCase;
@@ -182,8 +184,16 @@ public function testGetContentLength()
 
     public function testFeaturedImageGetContentLengthWithNoSource()
     {
+        HydeKernel::setInstance(new class extends HydeKernel
+        {
+            public function assets(): Collection
+            {
+                return new Collection();
+            }
+        });
+
         $this->expectException(FileNotFoundException::class);
-        $this->expectExceptionMessage('Featured image [_media/foo] not found.');
+        $this->expectExceptionMessage('File [_media/foo] not found when trying to resolve a media asset.');
 
         $image = new FeaturedImage('_media/foo', ...self::ARGUMENTS);
         $this->assertSame(0, $image->getContentLength());
diff --git a/packages/framework/tests/Unit/FilesystemFacadeMimeTypeHelperUnitTest.php b/packages/framework/tests/Unit/FilesystemFacadeMimeTypeHelperUnitTest.php
new file mode 100644
index 00000000000..d6dbf8d4364
--- /dev/null
+++ b/packages/framework/tests/Unit/FilesystemFacadeMimeTypeHelperUnitTest.php
@@ -0,0 +1,80 @@
+<?php
+
+declare(strict_types=1);
+
+use Hyde\Facades\Filesystem;
+use Hyde\Testing\UnitTestCase;
+
+/**
+ * @covers \Hyde\Facades\Filesystem
+ *
+ * @see \Hyde\Framework\Testing\Feature\FilesystemFacadeTest
+ */
+class FilesystemFacadeMimeTypeHelperUnitTest extends UnitTestCase
+{
+    protected static bool $needsKernel = true;
+
+    /**
+     * @dataProvider mimeTypeProvider
+     */
+    public function testFindMimeTypeWithKnownExtensions(string $extension, string $expectedMimeType)
+    {
+        $this->assertSame($expectedMimeType, Filesystem::findMimeType("file.$extension"));
+    }
+
+    /**
+     * @dataProvider mimeTypeProvider
+     */
+    public function testFindMimeTypeWithRemoteUrls(string $extension, string $expectedMimeType)
+    {
+        $this->assertSame($expectedMimeType, Filesystem::findMimeType("https://example.com/file.$extension"));
+    }
+
+    public function testFindMimeTypeWithUnknownExtension()
+    {
+        $this->assertSame('text/plain', Filesystem::findMimeType('file.unknown'));
+    }
+
+    public function testFindMimeTypeWithFileWithoutExtension()
+    {
+        $this->assertSame('text/plain', Filesystem::findMimeType('file'));
+    }
+
+    public function testFindMimeTypeWithRelativePath()
+    {
+        $this->assertSame('text/plain', Filesystem::findMimeType('path/to/file.txt'));
+    }
+
+    public function testFindMimeTypeWithAbsolutePath()
+    {
+        $this->assertSame('text/plain', Filesystem::findMimeType('/absolute/path/to/file.txt'));
+    }
+
+    public function testFindMimeTypeWithUrl()
+    {
+        $this->assertSame('text/html', Filesystem::findMimeType('https://example.com/page.html'));
+    }
+
+    public function testFindMimeTypeWithCaseSensitivity()
+    {
+        $this->assertSame('text/plain', Filesystem::findMimeType('file.TXT'));
+    }
+
+    public static function mimeTypeProvider(): array
+    {
+        return [
+            ['txt', 'text/plain'],
+            ['md', 'text/markdown'],
+            ['html', 'text/html'],
+            ['css', 'text/css'],
+            ['svg', 'image/svg+xml'],
+            ['png', 'image/png'],
+            ['jpg', 'image/jpeg'],
+            ['jpeg', 'image/jpeg'],
+            ['gif', 'image/gif'],
+            ['json', 'application/json'],
+            ['js', 'application/javascript'],
+            ['xml', 'application/xml'],
+        ];
+    }
+}
diff --git a/packages/framework/tests/Unit/Foundation/FilesystemHasMediaFilesTest.php b/packages/framework/tests/Unit/Foundation/FilesystemHasMediaFilesTest.php
new file mode 100644
index 00000000000..81806cafd43
--- /dev/null
+++ b/packages/framework/tests/Unit/Foundation/FilesystemHasMediaFilesTest.php
@@ -0,0 +1,137 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Hyde\Framework\Testing\Unit\Foundation;
+
+use Mockery;
+use Hyde\Foundation\Kernel\Filesystem;
+use Hyde\Hyde;
+use Hyde\Support\Filesystem\MediaFile;
+use Hyde\Testing\UnitTestCase;
+use Illuminate\Support\Collection;
+use Illuminate\Filesystem\Filesystem as BaseFilesystem;
+
+/**
+ * @covers \Hyde\Foundation\Kernel\Filesystem
+ */
+class FilesystemHasMediaFilesTest extends UnitTestCase
+{
+    protected static bool $needsKernel = true;
+    protected static bool $needsConfig = true;
+
+    protected TestableFilesystem $filesystem;
+
+    protected function setUp(): void
+    {
+        $this->filesystem = new TestableFilesystem(Hyde::getInstance());
+
+        $mock = Mockery::mock(BaseFilesystem::class)->makePartial();
+        $mock->shouldReceive('missing')->andReturn(false)->byDefault();
+        $mock->shouldReceive('size')->andReturn(100)->byDefault();
+        $mock->shouldReceive('hash')->andReturn('hash')->byDefault();
+
+        app()->instance(BaseFilesystem::class, $mock);
+    }
+
+    public function testAssetsMethodReturnsSameInstanceOnSubsequentCalls()
+    {
+        $firstCall = $this->filesystem->assets();
+        $secondCall = $this->filesystem->assets();
+
+        $this->assertSame($firstCall, $secondCall);
+    }
+
+    public function testAssetsMethodReturnsEmptyCollectionWhenNoMediaFiles()
+    {
+        $this->filesystem->setTestMediaFiles([]);
+
+        $assets = $this->filesystem->assets();
+
+        $this->assertInstanceOf(Collection::class, $assets);
+        $this->assertTrue($assets->isEmpty());
+    }
+
+    public function testAssetsMethodWithNestedDirectories()
+    {
+        $this->filesystem->setTestMediaFiles([
+            Hyde::path('_media/images/photo.jpg'),
+            Hyde::path('_media/documents/report.pdf'),
+        ]);
+
+        $assets = $this->filesystem->assets();
+
+        $this->assertCount(2, $assets);
+        $this->assertTrue($assets->has('images/photo.jpg'));
+        $this->assertTrue($assets->has('documents/report.pdf'));
+    }
+
+    public function testGetMediaGlobPatternWithCustomMediaDirectory()
+    {
+        Hyde::setMediaDirectory('custom_media');
+
+        $pattern = $this->filesystem->getTestMediaGlobPattern();
+
+        $this->assertStringContainsString('custom_media/', $pattern);
+
+        Hyde::setMediaDirectory('_media');
+    }
+
+    public function testGetMediaGlobPatternWithCustomExtensions()
+    {
+        self::mockConfig(['hyde.media_extensions' => ['gif', 'svg']]);
+
+        $pattern = $this->filesystem->getTestMediaGlobPattern();
+
+        $this->assertStringContainsString('{gif,svg}', $pattern);
+    }
+
+    public function testDiscoverMediaFilesWithEmptyResult()
+    {
+        $this->filesystem->setTestMediaFiles([]);
+
+        $result = $this->filesystem->getTestDiscoverMediaFiles();
+
+        $this->assertInstanceOf(Collection::class, $result);
+        $this->assertTrue($result->isEmpty());
+    }
+
+    public function testDiscoverMediaFilesWithMultipleFiles()
+    {
+        $this->filesystem->setTestMediaFiles([
+            Hyde::path('_media/image.jpg'),
+            Hyde::path('_media/document.pdf'),
+        ]);
+
+        $result = $this->filesystem->getTestDiscoverMediaFiles();
+
+        $this->assertCount(2, $result);
+        $this->assertInstanceOf(MediaFile::class, $result->get('image.jpg'));
+        $this->assertInstanceOf(MediaFile::class, $result->get('document.pdf'));
+    }
+}
+
+class TestableFilesystem extends Filesystem
+{
+    private static array $testMediaFiles = [];
+
+    public function setTestMediaFiles(array $files): void
+    {
+        self::$testMediaFiles = $files;
+    }
+
+    protected static function getMediaFiles(): array
+    {
+        return self::$testMediaFiles;
+    }
+
+    public function getTestMediaGlobPattern(): string
+    {
+        return static::getMediaGlobPattern();
+    }
+
+    public function getTestDiscoverMediaFiles(): Collection
+    {
+        return static::discoverMediaFiles();
+    }
+}
diff --git a/packages/framework/tests/Unit/IncludesFacadeUnitTest.php b/packages/framework/tests/Unit/IncludesFacadeUnitTest.php
index 072e6e710f7..17f982db1de 100644
--- a/packages/framework/tests/Unit/IncludesFacadeUnitTest.php
+++ b/packages/framework/tests/Unit/IncludesFacadeUnitTest.php
@@ -8,6 +8,7 @@
 use Closure;
 use Hyde\Hyde;
 use Hyde\Support\Includes;
+use Illuminate\Support\Str;
 use AllowDynamicProperties;
 use Hyde\Testing\UnitTestCase;
 use Illuminate\Support\HtmlString;
@@ -143,6 +144,8 @@ public function testMarkdownReturnsRenderedPartial()
         $this->mockFilesystemFromClosure(function ($filesystem) use ($filename) {
             $content = '# foo bar';
 
+            $filesystem->shouldReceive('glob')->andReturn([])->byDefault(); // Looking for media files
+
             $filesystem->shouldReceive('exists')->with($this->includesPath($filename))->andReturn(true);
             $filesystem->shouldReceive('get')->with($this->includesPath($filename))->andReturn($content);
         });
@@ -250,3 +253,15 @@ protected function assertHtmlStringIsSame(string|HtmlString $expected, mixed $ac
         $this->assertSame((string) $expected, $actual->toHtml());
     }
 }
+
+class SimpleMarkdownServiceTestClass
+{
+    public function __construct(protected string $markdown = '')
+    {
+    }
+
+    public function parse(): string
+    {
+        return Str::markdown($this->markdown);
+    }
+}
diff --git a/packages/framework/tests/Unit/MediaDirectoryCanBeChangedTest.php b/packages/framework/tests/Unit/MediaDirectoryCanBeChangedTest.php
index f2521fc54f6..741646b4c7e 100644
--- a/packages/framework/tests/Unit/MediaDirectoryCanBeChangedTest.php
+++ b/packages/framework/tests/Unit/MediaDirectoryCanBeChangedTest.php
@@ -67,12 +67,12 @@ public function testCompiledPagesHaveLinksToTheRightMediaFileLocation()
         $this->assertFileExists(Hyde::path('_site/foo.html'));
         $contents = file_get_contents(Hyde::path('_site/foo.html'));
         $this->assertStringContainsString(
-            '<link rel="stylesheet" href="assets/app.css?v='.md5_file(Hyde::path('_assets/app.css')).'">',
+            '<link rel="stylesheet" href="assets/app.css?v='.hash_file('crc32', Hyde::path('_assets/app.css')).'">',
             $contents
         );
 
         $this->assertStringContainsString(
-            '<script defer src="assets/app.js?v='.md5_file(Hyde::path('_assets/app.js')).'"></script>',
+            '<script defer src="assets/app.js?v='.hash_file('crc32', Hyde::path('_assets/app.js')).'"></script>',
             $contents
         );
 
diff --git a/packages/framework/tests/Unit/RelativeLinksAcrossPagesRetainsIntegrityTest.php b/packages/framework/tests/Unit/RelativeLinksAcrossPagesRetainsIntegrityTest.php
index e8f9f8c1f66..d15f0d9cbcc 100644
--- a/packages/framework/tests/Unit/RelativeLinksAcrossPagesRetainsIntegrityTest.php
+++ b/packages/framework/tests/Unit/RelativeLinksAcrossPagesRetainsIntegrityTest.php
@@ -22,7 +22,7 @@ protected function setUp(): void
     {
         parent::setUp();
 
-        config(['hyde.enable_cache_busting' => false]);
+        config(['hyde.cache_busting' => false]);
         config(['hyde.navigation.subdirectory_display' => 'flat']);
 
         $this->needsDirectory('_pages/nested');
diff --git a/packages/framework/tests/Unit/Support/MediaFileUnitTest.php b/packages/framework/tests/Unit/Support/MediaFileUnitTest.php
new file mode 100644
index 00000000000..1be4b464f59
--- /dev/null
+++ b/packages/framework/tests/Unit/Support/MediaFileUnitTest.php
@@ -0,0 +1,626 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Hyde\Framework\Testing\Unit\Support;
+
+use Mockery;
+use Illuminate\View\Factory;
+use Hyde\Foundation\HydeKernel;
+use Hyde\Support\Facades\Render;
+use Hyde\Support\Models\RenderData;
+use Hyde\Framework\Exceptions\FileNotFoundException;
+use Hyde\Hyde;
+use Hyde\Support\Filesystem\MediaFile;
+use Hyde\Testing\UnitTestCase;
+use Illuminate\Filesystem\Filesystem as BaseFilesystem;
+
+/**
+ * @covers \Hyde\Support\Filesystem\MediaFile
+ *
+ * @see \Hyde\Framework\Testing\Feature\Support\MediaFileTest
+ */
+class MediaFileUnitTest extends UnitTestCase
+{
+    protected static bool $needsKernel = true;
+    protected static bool $needsConfig = true;
+
+    protected static string $originalBasePath;
+
+    protected $mockFilesystem;
+
+    public static function setUpBeforeClass(): void
+    {
+        parent::setUpBeforeClass();
+
+        static::$originalBasePath = Hyde::getBasePath();
+
+        Hyde::setBasePath('/base/path');
+    }
+
+    public static function tearDownAfterClass(): void
+    {
+        Hyde::setBasePath(static::$originalBasePath);
+
+        parent::tearDownAfterClass();
+    }
+
+    protected function setUp(): void
+    {
+        $this->mockFilesystem = Mockery::mock(BaseFilesystem::class);
+        app()->instance(BaseFilesystem::class, $this->mockFilesystem);
+
+        // Set up default expectations for commonly called methods
+        $this->mockFilesystem->shouldReceive('isFile')->andReturn(true)->byDefault();
+        $this->mockFilesystem->shouldReceive('missing')->andReturn(false)->byDefault();
+        $this->mockFilesystem->shouldReceive('exists')->andReturn(true)->byDefault();
+        $this->mockFilesystem->shouldReceive('extension')->andReturn('txt')->byDefault();
+        $this->mockFilesystem->shouldReceive('size')->andReturn(12)->byDefault();
+        $this->mockFilesystem->shouldReceive('mimeType')->andReturn('text/plain')->byDefault();
+        $this->mockFilesystem->shouldReceive('hash')->andReturn(hash('crc32', 'Hello World!'))->byDefault();
+        $this->mockFilesystem->shouldReceive('get')->andReturn('Hello World!')->byDefault();
+
+        // Mock render data
+        \Illuminate\Support\Facades\View::swap(Mockery::mock(Factory::class)->makePartial());
+        Render::swap(new RenderData());
+
+        self::mockConfig(['hyde.cache_busting' => false]);
+    }
+
+    protected function tearDown(): void
+    {
+        $this->verifyMockeryExpectations();
+    }
+
+    public function testCanConstruct()
+    {
+        $file = new MediaFile('foo');
+
+        $this->assertInstanceOf(MediaFile::class, $file);
+        $this->assertSame('_media/foo', $file->path);
+    }
+
+    public function testCanMake()
+    {
+        $this->assertEquals(new MediaFile('foo'), MediaFile::make('foo'));
+    }
+
+    public function testCanGet()
+    {
+        $kernel = HydeKernel::getInstance();
+
+        $hyde = Mockery::mock(Hyde::kernel())->makePartial();
+        $hyde->shouldReceive('assets')->andReturn(collect(['app.css' => new MediaFile('_media/app.css')]));
+
+        HydeKernel::setInstance($hyde);
+
+        $this->assertEquals(new MediaFile('app.css'), MediaFile::get('app.css'));
+
+        HydeKernel::setInstance($kernel);
+    }
+
+    public function testCanConstructWithNestedPaths()
+    {
+        $this->assertSame('_media/path/to/file.txt', MediaFile::make('path/to/file.txt')->path);
+    }
+
+    public function testPathIsNormalizedToRelativeMediaPath()
+    {
+        $this->assertSame('_media/foo', MediaFile::make('foo')->path);
+    }
+
+    public function testAbsolutePathIsNormalizedToRelativeMediaPath()
+    {
+        $this->assertSame('_media/foo', MediaFile::make(Hyde::path('foo'))->path);
+    }
+
+    public function testMediaPathIsNormalizedToRelativeMediaPath()
+    {
+        $this->assertSame('_media/foo', MediaFile::make('_media/foo')->path);
+    }
+
+    public function testAbsoluteMediaPathIsNormalizedToRelativeMediaPath()
+    {
+        $this->assertSame('_media/foo', MediaFile::make(Hyde::path('_media/foo'))->path);
+    }
+
+    public function testOutputMediaPathIsNormalizedToRelativeMediaPath()
+    {
+        $this->assertSame('_media/foo', MediaFile::make('media/foo')->path);
+    }
+
+    public function testAbsoluteOutputMediaPathIsNormalizedToRelativeMediaPath()
+    {
+        $this->assertSame('_media/foo', MediaFile::make(Hyde::path('media/foo'))->path);
+    }
+
+    public function testCustomMediaPathsAreNormalizedToRelativeCustomizedMediaPath()
+    {
+        Hyde::setMediaDirectory('bar');
+
+        $this->assertSame('bar/foo', MediaFile::make('foo')->path);
+        $this->assertSame('bar/foo', MediaFile::make('bar/foo')->path);
+        $this->assertSame('bar/foo', MediaFile::make(Hyde::path('foo'))->path);
+
+        Hyde::setMediaDirectory('_bar');
+
+        $this->assertSame('_bar/foo', MediaFile::make('foo')->path);
+        $this->assertSame('_bar/foo', MediaFile::make('_bar/foo')->path);
+        $this->assertSame('_bar/foo', MediaFile::make(Hyde::path('_bar/foo'))->path);
+        $this->assertSame('_bar/foo', MediaFile::make('bar/foo')->path);
+        $this->assertSame('_bar/foo', MediaFile::make(Hyde::path('foo'))->path);
+
+        Hyde::setMediaDirectory('_media');
+    }
+
+    public function testConstructorWithVariousInputFormats()
+    {
+        $this->assertSame('_media/foo.txt', MediaFile::make('foo.txt')->path);
+        $this->assertSame('_media/foo.txt', MediaFile::make('_media/foo.txt')->path);
+        $this->assertSame('_media/foo.txt', MediaFile::make(Hyde::path('_media/foo.txt'))->path);
+        $this->assertSame('_media/foo.txt', MediaFile::make('media/foo.txt')->path);
+    }
+
+    public function testConstructorSetsProperties()
+    {
+        $file = new MediaFile('foo.txt');
+        $this->assertNotNull($file->getLength());
+        $this->assertNotNull($file->getMimeType());
+        $this->assertNotNull($file->getHash());
+    }
+
+    public function testNormalizePathWithAbsolutePath()
+    {
+        $this->assertSame('_media/foo.txt', MediaFile::make(Hyde::path('_media/foo.txt'))->path);
+    }
+
+    public function testNormalizePathWithRelativePath()
+    {
+        $this->assertSame('_media/foo.txt', MediaFile::make('foo.txt')->path);
+    }
+
+    public function testNormalizePathWithOutputDirectoryPath()
+    {
+        Hyde::setMediaDirectory('_custom_media');
+        $this->assertSame('_custom_media/foo.txt', MediaFile::make('custom_media/foo.txt')->path);
+        Hyde::setMediaDirectory('_media'); // Reset to default
+    }
+
+    public function testNormalizePathWithAlreadyCorrectFormat()
+    {
+        $this->assertSame('_media/foo.txt', MediaFile::make('_media/foo.txt')->path);
+    }
+
+    public function testNormalizePathWithParentDirectoryReferences()
+    {
+        $this->assertSame('_media/foo.txt', MediaFile::make('../_media/foo.txt')->path);
+        $this->assertSame('_media/baz/../bar/foo.txt', MediaFile::make('_media/baz/../bar/foo.txt')->path); // We don't do anything about this
+    }
+
+    public function testGetNameReturnsNameOfFile()
+    {
+        $this->assertSame('foo.txt', MediaFile::make('foo.txt')->getName());
+        $this->assertSame('bar.txt', MediaFile::make('foo/bar.txt')->getName());
+    }
+
+    public function testGetPathReturnsPathOfFile()
+    {
+        $this->assertSame('_media/foo.txt', MediaFile::make('foo.txt')->getPath());
+        $this->assertSame('_media/foo/bar.txt', MediaFile::make('foo/bar.txt')->getPath());
+    }
+
+    public function testGetAbsolutePathReturnsAbsolutePathOfFile()
+    {
+        $this->assertSame(Hyde::path('_media/foo.txt'), MediaFile::make('foo.txt')->getAbsolutePath());
+        $this->assertSame(Hyde::path('_media/foo/bar.txt'), MediaFile::make('foo/bar.txt')->getAbsolutePath());
+    }
+
+    public function testGetContentsReturnsContentsOfFile()
+    {
+        $this->mockFilesystem->shouldReceive('get')
+            ->andReturn('foo bar')
+            ->once();
+
+        $this->assertSame('foo bar', MediaFile::make('foo.txt')->getContents());
+    }
+
+    public function testGetExtensionReturnsExtensionOfFile()
+    {
+        $this->mockFilesystem->shouldReceive('extension')
+            ->with(Hyde::path('_media/foo.txt'))
+            ->andReturn('txt');
+
+        $this->mockFilesystem->shouldReceive('extension')
+            ->with(Hyde::path('_media/foo.png'))
+            ->andReturn('png');
+
+        $this->assertSame('txt', MediaFile::make('foo.txt')->getExtension());
+        $this->assertSame('png', MediaFile::make('foo.png')->getExtension());
+    }
+
+    public function testToArrayReturnsArrayOfFileProperties()
+    {
+        $this->mockFilesystem->shouldReceive('size')
+            ->with(Hyde::path('_media/foo.txt'))
+            ->andReturn(7);
+
+        $this->mockFilesystem->shouldReceive('mimeType')
+            ->with(Hyde::path('_media/foo.txt'))
+            ->andReturn('text/plain');
+
+        $this->mockFilesystem->shouldReceive('hash')
+            ->with(Hyde::path('_media/foo.txt'), 'crc32')
+            ->andReturn(hash('crc32', 'foo bar'));
+
+        $this->assertSame([
+            'name' => 'foo.txt',
+            'path' => '_media/foo.txt',
+            'length' => 7,
+            'mimeType' => 'text/plain',
+            'hash' => hash('crc32', 'foo bar'),
+        ], MediaFile::make('foo.txt')->toArray());
+    }
+
+    public function testGetLength()
+    {
+        $this->mockFilesystem->shouldReceive('size')
+            ->with(Hyde::path('_media/foo'))
+            ->andReturn(12);
+
+        $this->assertSame(12, MediaFile::make('foo')->getLength());
+    }
+
+    public function testGetMimeType()
+    {
+        $this->mockFilesystem->shouldReceive('mimeType')
+            ->with(Hyde::path('_media/foo.txt'))
+            ->andReturn('text/plain');
+
+        $this->assertSame('text/plain', MediaFile::make('foo.txt')->getMimeType());
+    }
+
+    public function testGetHashReturnsHash()
+    {
+        $this->mockFilesystem->shouldReceive('hash')
+            ->with(Hyde::path('_media/foo.txt'), 'crc32')
+            ->andReturn(hash('crc32', 'Hello World!'));
+
+        $this->assertSame(hash('crc32', 'Hello World!'), MediaFile::make('foo.txt')->getHash());
+    }
+
+    public function testGetMimeTypeReturnsLookupValueForKnownExtension()
+    {
+        $this->mockFilesystem->shouldReceive('extension')
+            ->with(Hyde::path('_media/foo.txt'))
+            ->andReturn('txt');
+
+        $this->assertSame('text/plain', MediaFile::make('foo.txt')->getMimeType());
+    }
+
+    public function testGetMimeTypeUsesFileinfoForUnknownExtension()
+    {
+        $this->mockFilesystem->shouldReceive('extension')
+            ->with(Hyde::path('_media/foo.xyz'))
+            ->andReturn('xyz');
+
+        $this->mockFilesystem->shouldReceive('exists')
+            ->with(Hyde::path('_media/foo.xyz'))
+            ->andReturn(true);
+
+        $this->mockFilesystem->shouldReceive('mimeType')
+            ->with(Hyde::path('_media/foo.xyz'))
+            ->andReturn('application/octet-stream');
+
+        $this->assertSame('application/octet-stream', MediaFile::make('foo.xyz')->getMimeType());
+    }
+
+    public function testGetMimeTypeReturnsTextPlainForNonExistentFile()
+    {
+        $this->mockFilesystem->shouldReceive('extension')
+            ->with(Hyde::path('_media/nonexistent.xyz'))
+            ->andReturn('xyz');
+
+        $this->mockFilesystem->shouldReceive('exists')
+            ->with(Hyde::path('_media/nonexistent.xyz'))
+            ->andReturn(false);
+
+        $this->assertSame('text/plain', MediaFile::make('nonexistent.xyz')->getMimeType());
+    }
+
+    /** @dataProvider bootableMethodsProvider */
+    public function testExceptionIsThrownWhenBootingFileThatDoesNotExist(string $bootableMethod)
+    {
+        $this->mockFilesystem->shouldReceive('missing')
+            ->with(Hyde::path('_media/foo'))
+            ->andReturn(true);
+
+        $this->expectException(FileNotFoundException::class);
+        $this->expectExceptionMessage('File [_media/foo] not found when trying to resolve a media asset.');
+
+        MediaFile::make('foo')->$bootableMethod();
+    }
+
+    public function testExceptionIsNotThrownWhenConstructingFileThatDoesExist()
+    {
+        $this->mockFilesystem->shouldReceive('missing')
+            ->with(Hyde::path('_media/foo'))
+            ->andReturn(false);
+
+        $this->assertInstanceOf(MediaFile::class, MediaFile::make('foo'));
+    }
+
+    public function testGetIdentifierWithSubdirectory()
+    {
+        $this->assertSame('foo/bar', MediaFile::make('foo/bar')->getIdentifier());
+    }
+
+    public function testGetIdentifierReturnsIdentifierWithFileExtension()
+    {
+        $this->assertSame('foo.png', MediaFile::make('foo.png')->getIdentifier());
+    }
+
+    public function testGetIdentifierWithSubdirectoryWithFileExtension()
+    {
+        $this->assertSame('foo/bar.png', MediaFile::make('foo/bar.png')->getIdentifier());
+    }
+
+    public function testHelperForMediaPath()
+    {
+        $this->assertSame('/base/path/_media', MediaFile::sourcePath());
+    }
+
+    public function testHelperForMediaPathReturnsPathToFileWithinTheDirectory()
+    {
+        $this->assertSame('/base/path/_media/foo.css', MediaFile::sourcePath('foo.css'));
+    }
+
+    public function testGetMediaPathReturnsAbsolutePath()
+    {
+        $this->assertSame('/base/path/_media', MediaFile::sourcePath());
+    }
+
+    public function testHelperForMediaOutputPath()
+    {
+        $this->assertSame('/base/path/_site/media', MediaFile::outputPath());
+    }
+
+    public function testHelperForMediaOutputPathReturnsPathToFileWithinTheDirectory()
+    {
+        $this->assertSame('/base/path/_site/media/foo.css', MediaFile::outputPath('foo.css'));
+    }
+
+    public function testGetMediaOutputPathReturnsAbsolutePath()
+    {
+        $this->assertSame('/base/path/_site/media', MediaFile::outputPath());
+    }
+
+    public function testCanGetSiteMediaOutputDirectory()
+    {
+        $this->assertSame('/base/path/_site/media', MediaFile::outputPath());
+    }
+
+    public function testGetSiteMediaOutputDirectoryUsesTrimmedVersionOfMediaSourceDirectory()
+    {
+        Hyde::setMediaDirectory('_foo');
+        $this->assertSame('/base/path/_site/foo', MediaFile::outputPath());
+        Hyde::setMediaDirectory('_media'); // Reset to default
+    }
+
+    public function testGetSiteMediaOutputDirectoryUsesConfiguredSiteOutputDirectory()
+    {
+        Hyde::setOutputDirectory('/base/path/foo');
+        Hyde::setMediaDirectory('bar');
+
+        $this->assertSame('/base/path/foo/bar', MediaFile::outputPath());
+
+        Hyde::setOutputDirectory('/base/path/_site'); // Reset to default
+        Hyde::setMediaDirectory('_media'); // Reset to default
+    }
+
+    public function testSourcePathWithEmptyString()
+    {
+        $this->assertSame(Hyde::path('_media'), MediaFile::sourcePath(''));
+    }
+
+    public function testSourcePathWithSubdirectories()
+    {
+        $this->assertSame(Hyde::path('_media/foo/bar'), MediaFile::sourcePath('foo/bar'));
+    }
+
+    public function testSourcePathWithLeadingSlash()
+    {
+        $this->assertSame(Hyde::path('_media/foo'), MediaFile::sourcePath('/foo'));
+    }
+
+    public function testOutputPathWithEmptyString()
+    {
+        $this->assertSame(Hyde::sitePath('media'), MediaFile::outputPath(''));
+    }
+
+    public function testOutputPathWithSubdirectories()
+    {
+        $this->assertSame(Hyde::sitePath('media/foo/bar'), MediaFile::outputPath('foo/bar'));
+    }
+
+    public function testOutputPathWithLeadingSlash()
+    {
+        $this->assertSame(Hyde::sitePath('media/foo'), MediaFile::outputPath('/foo'));
+    }
+
+    public function testGetLink()
+    {
+        $file = MediaFile::make('foo.txt');
+        $this->assertSame('media/foo.txt', $file->getLink());
+    }
+
+    public function testGetLinkWithCustomMediaDirectory()
+    {
+        Hyde::setMediaDirectory('custom_media');
+        $file = MediaFile::make('foo.txt');
+        $this->assertSame('custom_media/foo.txt', $file->getLink());
+        Hyde::setMediaDirectory('_media'); // Reset to default
+    }
+
+    public function testGetLinkWithPrettyUrls()
+    {
+        self::mockConfig(['hyde.cache_busting' => false, 'hyde.pretty_urls' => true]);
+        $file = MediaFile::make('foo.txt');
+        $this->assertSame('media/foo.txt', $file->getLink());
+    }
+
+    public function testGetLinkWithNestedFile()
+    {
+        $file = MediaFile::make('subdirectory/foo.txt');
+        $this->assertSame('media/subdirectory/foo.txt', $file->getLink());
+    }
+
+    public function testGetLinkWithBaseUrl()
+    {
+        self::mockConfig(['hyde.cache_busting' => false, 'hyde.url' => 'https://example.com']);
+        $file = MediaFile::make('foo.txt');
+        $this->assertSame('https://example.com/media/foo.txt', $file->getLink());
+    }
+
+    public function testGetLinkWithBaseUrlAndPrettyUrls()
+    {
+        self::mockConfig([
+            'hyde.cache_busting' => false,
+            'hyde.url' => 'https://example.com',
+            'hyde.pretty_urls' => true,
+        ]);
+        $file = MediaFile::make('foo.txt');
+        $this->assertSame('https://example.com/media/foo.txt', $file->getLink());
+    }
+
+    public function testGetLinkWithCacheBusting()
+    {
+        self::mockConfig(['hyde.cache_busting' => true]);
+        $this->mockFilesystem->shouldReceive('hash')
+            ->andReturn('abc123');
+        $file = MediaFile::make('foo.txt');
+        $this->assertSame('media/foo.txt?v=abc123', $file->getLink());
+    }
+
+    public function testGetLinkWithCacheBustingDisabled()
+    {
+        self::mockConfig(['hyde.cache_busting' => false]);
+        $file = MediaFile::make('foo.txt');
+        $this->assertSame('media/foo.txt', $file->getLink());
+    }
+
+    public function testGetLinkWithCurrentPageContext()
+    {
+        $this->mockCurrentPage('foo/bar');
+        $file = MediaFile::make('baz.txt');
+        $this->assertSame('../media/baz.txt', $file->getLink());
+    }
+
+    public function testGetLinkWithCurrentPageContextAndCustomMediaDirectory()
+    {
+        Hyde::setMediaDirectory('custom_media');
+        $this->mockCurrentPage('foo/bar');
+        $file = MediaFile::make('baz.txt');
+        $this->assertSame('../custom_media/baz.txt', $file->getLink());
+        Hyde::setMediaDirectory('_media'); // Reset to default
+    }
+
+    public function testCanCastToString()
+    {
+        $file = new MediaFile('foo.txt');
+        $this->assertIsString((string) $file);
+        $this->assertSame('media/foo.txt', (string) $file);
+    }
+
+    public function testStringCastReturnsLink()
+    {
+        $file = new MediaFile('foo.txt');
+        $this->assertSame($file->getLink(), (string) $file);
+    }
+
+    public function testStringCastWithCustomMediaDirectory()
+    {
+        Hyde::setMediaDirectory('custom_media');
+        $file = new MediaFile('foo.txt');
+        $this->assertSame('custom_media/foo.txt', (string) $file);
+        Hyde::setMediaDirectory('_media'); // Reset to default
+    }
+
+    public function testStringCastWithPrettyUrls()
+    {
+        self::mockConfig(['hyde.cache_busting' => false, 'hyde.pretty_urls' => true]);
+        $file = new MediaFile('foo.txt');
+        $this->assertSame('media/foo.txt', (string) $file);
+    }
+
+    public function testStringCastWithNestedFile()
+    {
+        $file = new MediaFile('subdirectory/foo.txt');
+        $this->assertSame('media/subdirectory/foo.txt', (string) $file);
+    }
+
+    public function testStringCastWithBaseUrl()
+    {
+        self::mockConfig(['hyde.cache_busting' => false, 'hyde.url' => 'https://example.com']);
+        $file = new MediaFile('foo.txt');
+        $this->assertSame('https://example.com/media/foo.txt', (string) $file);
+    }
+
+    public function testStringCastWithCacheBusting()
+    {
+        self::mockConfig(['hyde.cache_busting' => true]);
+        $this->mockFilesystem->shouldReceive('hash')
+            ->andReturn('abc123');
+        $file = new MediaFile('foo.txt');
+        $this->assertSame('media/foo.txt?v=abc123', (string) $file);
+    }
+
+    public function testStringCastWithCurrentPageContext()
+    {
+        $this->mockCurrentPage('foo/bar');
+        $file = new MediaFile('baz.txt');
+        $this->assertSame('../media/baz.txt', (string) $file);
+    }
+
+    public function testGetOutputPath()
+    {
+        $file = MediaFile::make('foo.txt');
+        $this->assertSame('/base/path/_site/media/foo.txt', $file->getOutputPath());
+    }
+
+    public function testGetOutputPathWithNestedFile()
+    {
+        $file = MediaFile::make('subdirectory/foo.txt');
+        $this->assertSame('/base/path/_site/media/subdirectory/foo.txt', $file->getOutputPath());
+    }
+
+    public function testGetOutputPathWithCustomMediaDirectory()
+    {
+        Hyde::setMediaDirectory('custom_media');
+        $file = MediaFile::make('foo.txt');
+        $this->assertSame('/base/path/_site/custom_media/foo.txt', $file->getOutputPath());
+        Hyde::setMediaDirectory('_media'); // Reset to default
+    }
+
+    public function testGetOutputPathWithCustomOutputDirectory()
+    {
+        Hyde::setOutputDirectory('/base/path/custom_output');
+        $file = MediaFile::make('foo.txt');
+        $this->assertSame('/base/path/custom_output/media/foo.txt', $file->getOutputPath());
+        Hyde::setOutputDirectory('/base/path/_site'); // Reset to default
+    }
+
+    // Helper method to mock the current page
+    protected function mockCurrentPage(string $page): void
+    {
+        Render::shouldReceive('getRouteKey')->andReturn($page);
+    }
+
+    public static function bootableMethodsProvider(): array
+    {
+        return [
+            ['getLength'],
+            ['getMimeType'],
+            ['getHash'],
+        ];
+    }
+}
diff --git a/packages/framework/tests/Unit/Views/ArticleExcerptViewTest.php b/packages/framework/tests/Unit/Views/ArticleExcerptViewTest.php
index ea83bdc457a..062bd3f4b2d 100644
--- a/packages/framework/tests/Unit/Views/ArticleExcerptViewTest.php
+++ b/packages/framework/tests/Unit/Views/ArticleExcerptViewTest.php
@@ -96,17 +96,34 @@ public function testItempropImageIsNotAddedWhenThereIsNoImage()
         $this->assertStringNotContainsString('itemprop="image"', $view);
     }
 
-    public function testItempropImageIsAddedWhenThereIsAnImage()
+    public function testItempropImageIsAddedWhenThereIsAnImageWithLocalPath()
     {
-        // Test with local path
+        $this->file('_media/image.jpg');
+
         $viewLocal = $this->renderTestView(MarkdownPost::make(matter: [
-            'image' => 'path/to/local/image.jpg',
+            'image' => 'image.jpg',
         ]));
 
         $this->assertStringContainsString('itemprop="image"', $viewLocal);
-        $this->assertStringContainsString('content="media/path/to/local/image.jpg"', $viewLocal);
+        $this->assertStringContainsString('content="media/image.jpg?v=00000000"', $viewLocal);
+    }
+
+    public function testItempropImageIsAddedWhenThereIsAnImageWithLocalPathNoCache()
+    {
+        $this->file('_media/image.jpg');
+
+        config(['hyde.cache_busting' => false]);
 
-        // Test with remote URL
+        $viewLocalNoCache = $this->renderTestView(MarkdownPost::make(matter: [
+            'image' => 'image.jpg',
+        ]));
+
+        $this->assertStringContainsString('itemprop="image"', $viewLocalNoCache);
+        $this->assertStringContainsString('content="media/image.jpg"', $viewLocalNoCache);
+    }
+
+    public function testItempropImageIsAddedWhenThereIsAnImageWithRemoteUrl()
+    {
         $viewRemote = $this->renderTestView(MarkdownPost::make(matter: [
             'image' => 'https://example.com/image.jpg',
         ]));
diff --git a/packages/framework/tests/Unit/Views/FeaturedImageViewTest.php b/packages/framework/tests/Unit/Views/FeaturedImageViewTest.php
index 3e6fa630c6c..a15ade44528 100644
--- a/packages/framework/tests/Unit/Views/FeaturedImageViewTest.php
+++ b/packages/framework/tests/Unit/Views/FeaturedImageViewTest.php
@@ -4,6 +4,7 @@
 
 namespace Hyde\Framework\Testing\Unit\Views;
 
+use Hyde\Hyde;
 use Hyde\Framework\Factories\FeaturedImageFactory;
 use Hyde\Framework\Features\Blogging\Models\FeaturedImage;
 use Hyde\Markdown\Models\FrontMatter;
@@ -15,6 +16,13 @@
  */
 class FeaturedImageViewTest extends TestCase
 {
+    protected function setUp(): void
+    {
+        parent::setUp();
+        $this->file('_media/foo.jpg', 'test content');
+        config(['hyde.cache_busting' => false]);
+    }
+
     public function testTheView()
     {
         $component = $this->renderComponent([
@@ -249,6 +257,22 @@ public function testFluentAttributionLogicCreatesFluentMessages7()
         );
     }
 
+    public function testCacheBusting()
+    {
+        config(['hyde.cache_busting' => true]);
+        $component = $this->renderComponent();
+        $this->assertStringContainsString('src="media/foo.jpg?v=98b41d87"', $component);
+    }
+
+    public function testImagePathNormalization()
+    {
+        Hyde::setMediaDirectory('custom_media');
+        $this->file('custom_media/bar.png', 'test content');
+
+        $component = $this->renderComponent(['image.source' => 'bar.png']);
+        $this->assertStringContainsString('src="custom_media/bar.png"', $component);
+    }
+
     protected function stripHtml(string $string): string
     {
         return trim($this->stripWhitespace(strip_tags($string)), "\t ");
@@ -259,7 +283,7 @@ protected function stripWhitespace(string $string): string
         return str_replace([' ', "\r", "\n"], '', $string);
     }
 
-    protected function renderComponent(FeaturedImage|array $data = ['image.source' => 'foo']): string
+    protected function renderComponent(FeaturedImage|array $data = ['image.source' => 'foo.jpg']): string
     {
         $image = $data instanceof FeaturedImage ? $data : $this->make($data);
 
@@ -270,9 +294,10 @@ protected function renderComponent(FeaturedImage|array $data = ['image.source' =
         return view('hyde::components.post.image')->render();
     }
 
-    protected function make(array $data = [], string $path = 'foo.png'): FeaturedImage
+    protected function make(array $data = [], string $path = 'foo.jpg'): FeaturedImage
     {
-        $this->file("_media/$path");
+        $mediaDir = config('hyde.media_directory', '_media');
+        $this->file("$mediaDir/$path", 'test content');
 
         return FeaturedImageFactory::make(FrontMatter::fromArray(array_merge(
             ['image.source' => $path],
diff --git a/packages/framework/tests/Unit/Views/HeadComponentViewTest.php b/packages/framework/tests/Unit/Views/HeadComponentViewTest.php
index 3678fd3a04f..d16df103f5f 100644
--- a/packages/framework/tests/Unit/Views/HeadComponentViewTest.php
+++ b/packages/framework/tests/Unit/Views/HeadComponentViewTest.php
@@ -51,7 +51,7 @@ public function testLinkToFaviconIsAddedWhenFileExists()
         $this->mockPage();
         $this->file('_media/favicon.ico');
 
-        $this->assertStringContainsString('<link rel="shortcut icon" href="media/favicon.ico" type="image/x-icon">', $this->renderTestView());
+        $this->assertStringContainsString('<link rel="shortcut icon" href="media/favicon.ico?v=00000000" type="image/x-icon">', $this->renderTestView());
     }
 
     public function testLinkToFaviconUsesRelativeUrl()
@@ -59,6 +59,26 @@ public function testLinkToFaviconUsesRelativeUrl()
         $this->file('_media/favicon.ico');
         $this->mockPage(currentPage: 'foo/bar');
 
+        $this->assertStringContainsString('<link rel="shortcut icon" href="../media/favicon.ico?v=00000000" type="image/x-icon">', $this->renderTestView());
+    }
+
+    public function testLinkToFaviconUsesAbsoluteBaseUrl()
+    {
+        $this->file('_media/favicon.ico');
+        $this->mockPage(currentPage: 'foo/bar');
+
+        config(['hyde.url' => 'https://example.com']);
+
+        $this->assertStringContainsString('<link rel="shortcut icon" href="https://example.com/media/favicon.ico?v=00000000" type="image/x-icon">', $this->renderTestView());
+    }
+
+    public function testLinkToFaviconDoesNotUseCacheBustingWhenDisabled()
+    {
+        $this->file('_media/favicon.ico');
+        $this->mockPage(currentPage: 'foo/bar');
+
+        config(['hyde.cache_busting' => false]);
+
         $this->assertStringContainsString('<link rel="shortcut icon" href="../media/favicon.ico" type="image/x-icon">', $this->renderTestView());
     }
 
diff --git a/packages/framework/tests/Unit/Views/ScriptsComponentViewTest.php b/packages/framework/tests/Unit/Views/ScriptsComponentViewTest.php
index 63abb92a8a9..d16027a70b0 100644
--- a/packages/framework/tests/Unit/Views/ScriptsComponentViewTest.php
+++ b/packages/framework/tests/Unit/Views/ScriptsComponentViewTest.php
@@ -18,7 +18,7 @@ class ScriptsComponentViewTest extends TestCase
 
     protected function renderTestView(): string
     {
-        config(['hyde.enable_cache_busting' => false]);
+        config(['hyde.cache_busting' => false]);
         $this->mockCurrentPage($this->mockCurrentPage ?? '');
 
         return Blade::render(file_get_contents(
diff --git a/packages/framework/tests/Unit/Views/StylesComponentViewTest.php b/packages/framework/tests/Unit/Views/StylesComponentViewTest.php
index bfe078d00f1..95fb7a2ee09 100644
--- a/packages/framework/tests/Unit/Views/StylesComponentViewTest.php
+++ b/packages/framework/tests/Unit/Views/StylesComponentViewTest.php
@@ -5,7 +5,7 @@
 namespace Hyde\Framework\Testing\Unit\Views;
 
 use Hyde\Facades\Filesystem;
-use Hyde\Facades\Asset;
+use Hyde\Facades\HydeFront;
 use Hyde\Hyde;
 use Hyde\Support\Facades\Render;
 use Hyde\Testing\TestCase;
@@ -20,7 +20,7 @@ class StylesComponentViewTest extends TestCase
 
     protected function renderTestView(): string
     {
-        config(['hyde.enable_cache_busting' => false]);
+        config(['hyde.cache_busting' => false]);
         $this->mockCurrentPage($this->mockCurrentPage ?? '');
 
         return Blade::render(file_get_contents(
@@ -80,7 +80,7 @@ public function testComponentRendersTailwindPlayCdnLinkWhenEnabledInConfig()
     public function testComponentRendersAppCdnLinkWhenEnabledInConfig()
     {
         config(['hyde.load_app_styles_from_cdn' => true]);
-        $this->assertStringContainsString(Asset::cdnLink('app.css'), $this->renderTestView());
+        $this->assertStringContainsString(HydeFront::cdnLink('app.css'), $this->renderTestView());
     }
 
     public function testComponentDoesNotRenderLinkToLocalAppCssWhenCdnLinkIsEnabledInConfig()