diff --git a/components/ContentPicker/index.js b/components/ContentPicker/index.js
index 673fd21e..b801441c 100644
--- a/components/ContentPicker/index.js
+++ b/components/ContentPicker/index.js
@@ -7,7 +7,7 @@ import { __ } from '@wordpress/i18n';
 import { ContentSearch } from '../ContentSearch';
 import SortableList from './SortableList';
 
-const NAMESPACE = '10up-block-components';
+const NAMESPACE = '10up-content-picker';
 
 /**
  * Content Picker
diff --git a/components/ContentSearch/SearchItem.js b/components/ContentSearch/SearchItem.js
index 470d4b5e..de268cee 100644
--- a/components/ContentSearch/SearchItem.js
+++ b/components/ContentSearch/SearchItem.js
@@ -14,7 +14,9 @@ import { Button, TextHighlight } from '@wordpress/components';
  * @param props.id
  * @return {*} React JSX
  */
-const SearchItem = ({ suggestion, onClick, searchTerm, isSelected, id }) => {
+const SearchItem = ({ suggestion, onClick, searchTerm, isSelected, id, contentTypes }) => {
+	const showType = suggestion.type && contentTypes.length > 1;
+
 	return (
 		<Button
 			id={id}
@@ -27,14 +29,25 @@ const SearchItem = ({ suggestion, onClick, searchTerm, isSelected, id }) => {
 			}}
 		>
 			<span className="block-editor-link-control__search-item-header">
-				<span className="block-editor-link-control__search-item-title">
+				<span
+					className="block-editor-link-control__search-item-title"
+					style={{
+						paddingRight: !showType ? 0 : null,
+					}}
+				>
 					<TextHighlight text={decodeEntities(suggestion.title)} highlight={searchTerm} />
 				</span>
-				<span aria-hidden className="block-editor-link-control__search-item-info">
+				<span
+					aria-hidden
+					className="block-editor-link-control__search-item-info"
+					style={{
+						paddingRight: !showType ? 0 : null,
+					}}
+				>
 					{filterURLForDisplay(safeDecodeURI(suggestion.url)) || ''}
 				</span>
 			</span>
-			{suggestion.type && (
+			{showType && (
 				<span className="block-editor-link-control__search-item-type">
 					{/* Rename 'post_tag' to 'tag'. Ideally, the API would return the localised CPT or taxonomy label. */}
 					{suggestion.type === 'post_tag' ? 'tag' : suggestion.type}
@@ -56,6 +69,7 @@ SearchItem.propTypes = {
 	suggestion: PropTypes.object.isRequired,
 	onClick: PropTypes.func.isRequired,
 	isSelected: PropTypes.bool,
+	contentTypes: PropTypes.array.isRequired,
 };
 
 export default SearchItem;
diff --git a/components/ContentSearch/index.js b/components/ContentSearch/index.js
index 0282ef40..f48f1884 100644
--- a/components/ContentSearch/index.js
+++ b/components/ContentSearch/index.js
@@ -1,11 +1,13 @@
 import { TextControl, Spinner, NavigableMenu } from '@wordpress/components';
 import apiFetch from '@wordpress/api-fetch';
-import { useState } from '@wordpress/element'; // eslint-disable-line
+import { useState, useRef, useEffect } from '@wordpress/element'; // eslint-disable-line
 import PropTypes from 'prop-types';
 import { __ } from '@wordpress/i18n';
 import SearchItem from './SearchItem';
 
-const NAMESPACE = '10up-block-components';
+const NAMESPACE = '10up-content-search';
+
+const searchCache = {};
 
 const ContentSearch = ({ onSelectItem, placeholder, label, contentTypes, mode, excludeItems }) => {
 	const [searchString, setSearchString] = useState('');
@@ -13,6 +15,8 @@ const ContentSearch = ({ onSelectItem, placeholder, label, contentTypes, mode, e
 	const [isLoading, setIsLoading] = useState(false);
 	const [selectedItem, setSelectedItem] = useState(null);
 
+	const mounted = useRef(true);
+
 	/**
 	 * handleSelection
 	 *
@@ -55,28 +59,45 @@ const ContentSearch = ({ onSelectItem, placeholder, label, contentTypes, mode, e
 			',',
 		)}&type=${mode}`;
 
-		apiFetch({
-			path: searchQuery,
-		}).then((results) => {
-			const newResults = results.filter((result) => {
-				let keep = true;
-
-				if (excludeItems.length) {
-					excludeItems.forEach((item) => {
-						if (item.id === result.id) {
-							keep = false;
-						}
-					});
+		if (searchCache[searchQuery]) {
+			setSearchResults(searchCache[searchQuery]);
+			setIsLoading(false);
+		} else {
+			apiFetch({
+				path: searchQuery,
+			}).then((results) => {
+				if (mounted.current === false) {
+					return;
 				}
 
-				return keep;
-			});
+				const newResults = results.filter((result) => {
+					let keep = true;
 
-			setSearchResults(newResults);
-			setIsLoading(false);
-		});
+					if (excludeItems.length) {
+						excludeItems.forEach((item) => {
+							if (item.id === result.id) {
+								keep = false;
+							}
+						});
+					}
+
+					return keep;
+				});
+
+				searchCache[searchQuery] = newResults;
+
+				setSearchResults(newResults);
+				setIsLoading(false);
+			});
+		}
 	};
 
+	useEffect(() => {
+		return () => {
+			mounted.current = false;
+		};
+	}, []);
+
 	return (
 		<NavigableMenu onNavigate={handleSelection} orientation="vertical">
 			<TextControl
@@ -88,7 +109,7 @@ const ContentSearch = ({ onSelectItem, placeholder, label, contentTypes, mode, e
 			/>
 			{hasSearchString ? (
 				<ul
-					className={`${NAMESPACE}-grid`}
+					className={`${NAMESPACE}-list`}
 					style={{
 						marginTop: '0',
 						marginBottom: '0',
@@ -100,7 +121,7 @@ const ContentSearch = ({ onSelectItem, placeholder, label, contentTypes, mode, e
 					{isLoading && <Spinner />}
 					{!isLoading && !hasSearchResults && (
 						<li
-							className={`${NAMESPACE}-grid-item components-button`}
+							className={`${NAMESPACE}-list-item components-button`}
 							style={{ color: 'inherit', cursor: 'default', paddingLeft: '3px' }}
 						>
 							{__('Nothing found.', '10up-block-components')}
@@ -114,7 +135,7 @@ const ContentSearch = ({ onSelectItem, placeholder, label, contentTypes, mode, e
 						return (
 							<li
 								key={item.id}
-								className={`${NAMESPACE}-grid-item`}
+								className={`${NAMESPACE}-list-item`}
 								style={{
 									marginBottom: '0',
 								}}
@@ -123,6 +144,7 @@ const ContentSearch = ({ onSelectItem, placeholder, label, contentTypes, mode, e
 									onClick={() => handleItemSelection(item)}
 									searchTerm={searchString}
 									suggestion={item}
+									contentTypes={contentTypes}
 									isSelected={selectedItem === index + 1}
 								/>
 							</li>
@@ -141,7 +163,7 @@ ContentSearch.defaultProps = {
 	excludeItems: [],
 	mode: 'post',
 	onSelectItem: () => {
-		console.log('Select!');
+		console.log('Select!'); // eslint-disable-line no-console
 	},
 };