diff --git a/docs/documentation/server_admin/images/cache-tab.png b/docs/documentation/server_admin/images/cache-tab.png
deleted file mode 100644
index 36d0dc5830c..00000000000
Binary files a/docs/documentation/server_admin/images/cache-tab.png and /dev/null differ
diff --git a/docs/documentation/server_admin/topics/admin-console.adoc b/docs/documentation/server_admin/topics/admin-console.adoc
index a28eee5c83e..544437a7c7c 100644
--- a/docs/documentation/server_admin/topics/admin-console.adoc
+++ b/docs/documentation/server_admin/topics/admin-console.adoc
@@ -7,9 +7,6 @@ include::realms/proc-using-admin-console.adoc[leveloffset=1]
 include::realms/master.adoc[leveloffset=2]
 include::realms/proc-creating-a-realm.adoc[leveloffset=2]
 include::realms/ssl.adoc[leveloffset=2][]
-ifeval::[{project_product}==true]
-include::realms/cache.adoc[leveloffset=2][]
-endif::[]
 include::realms/email.adoc[leveloffset=2]
 include::realms/themes.adoc[leveloffset=2]
 include::realms/proc-configuring-internationalization.adoc[leveloffset=2]
diff --git a/docs/documentation/server_admin/topics/realms/cache.adoc b/docs/documentation/server_admin/topics/realms/cache.adoc
deleted file mode 100644
index 0b37cb32673..00000000000
--- a/docs/documentation/server_admin/topics/realms/cache.adoc
+++ /dev/null
@@ -1,16 +0,0 @@
-[[_clear-cache]]
-= Clearing server caches
-
-{project_name} caches everything it can in memory within the limits of your JVM and the limits you have configured.  If the {project_name} database is modified by a third party, such as a DBA, outside the scope of the server's REST APIs or Admin Console, parts of the in-memory cache could be stale.  You can clear the realm cache, user cache or cache of external public keys, such as Public keys of
- external clients or Identity providers, which {project_name} may use to verify signatures of particular external entity.
-
-.Procedure
-
-. Click *Realm Settings* in the menu.
-
-. Click the *Cache* tab.
-
-. Click *Clear* for the cache you want to evict.
-+
-.Cache tab
-image:images/cache-tab.png[Cache tab]
diff --git a/docs/guides/getting-started/templates/first-app.adoc b/docs/guides/getting-started/templates/first-app.adoc
index 5fe07c69d6f..dc13a30be71 100644
--- a/docs/guides/getting-started/templates/first-app.adoc
+++ b/docs/guides/getting-started/templates/first-app.adoc
@@ -9,12 +9,11 @@ To secure the first application, you start by registering the application with y
 . Fill in the form with the following values:
 ** *Client type*: `OpenID Connect`
 ** *Client ID*: `myclient`
++
+image::add-client-1.png[Add Client]
 . Click *Next*
 . Confirm that *Standard flow* is enabled.
 . Click *Next*.
-+
-image::add-client-1.png[Add Client]
-
 . Make these changes under *Login settings*.
 * Set *Valid redirect URIs* to `+https://www.keycloak.org/app/*+`
 * Set *Web origins* to `+https://www.keycloak.org+`