diff --git a/src/ChangeLog b/src/ChangeLog
index ef080fadb1..140d9e2817 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2003-05-28  Lars Gullik Bjønnes  <larsbj@lyx.org>
+
+	* lyxtextclass.C (operator): remove caching (bug 1050)
+
 2003-06-03  John Levon  <levon@movementarian.org>
 
 	* ispell.C: HPUX build fix from Albert Chin
diff --git a/src/lyxtextclass.C b/src/lyxtextclass.C
index 0b484552a1..e18000f194 100644
--- a/src/lyxtextclass.C
+++ b/src/lyxtextclass.C
@@ -740,12 +740,6 @@ LyXLayout_ptr const & LyXTextClass::operator[](string const & n) const
 
 	string const name = (n.empty() ? defaultLayoutName() : n);
 
-	static string lastLayoutName;
-	static LayoutList::difference_type lastLayoutIndex;
-
-	if (name == lastLayoutName)
-		return layoutlist_[lastLayoutIndex];
-
 	LayoutList::const_iterator cit =
 		find_if(layoutlist_.begin(),
 			layoutlist_.end(),
@@ -760,9 +754,6 @@ LyXLayout_ptr const & LyXTextClass::operator[](string const & n) const
 		lyx::Assert(false);
 	}
 
-	lastLayoutName = name;
-	lastLayoutIndex = std::distance(layoutlist_.begin(), cit);
-
 	return (*cit);
 }
 
diff --git a/status.13x b/status.13x
index 3aa5cab460..3aecc15d7f 100644
--- a/status.13x
+++ b/status.13x
@@ -25,6 +25,8 @@ What's new
 
 ** Bug fixes
 
+- fix possible crash when changing text class [bug #1050]
+
 - work around a Qt 3.1.2 bug with the environment combo box [bug #1136]
 
 - fix bug where browsing for files in graphics inset would always