diff --git a/wp-includes/canonical.php b/wp-includes/canonical.php
index ff3693791..6817b0fd7 100644
--- a/wp-includes/canonical.php
+++ b/wp-includes/canonical.php
@@ -168,8 +168,10 @@ function redirect_canonical($requested_url=null, $do_redirect=true) {
 				if ( ! empty($tax_url['query']) ) { // Custom taxonomies may only be accessable via ?taxonomy=..&term=..
 					parse_str($tax_url['query'], $query_vars);
 					$redirect['query'] = add_query_arg($query_vars, $redirect['query']);
+					error_log('ugly redir');
 				} else { // Taxonomy is accessable via a "pretty-URL"
 					$redirect['path'] = $tax_url['path'];
+					error_log('pretty redir');
 				}
 			}
 		} elseif ( is_single() && strpos($wp_rewrite->permalink_structure, '%category%') !== false ) {
diff --git a/wp-includes/category-template.php b/wp-includes/category-template.php
index d491a6ced..9aae78eec 100644
--- a/wp-includes/category-template.php
+++ b/wp-includes/category-template.php
@@ -1066,9 +1066,11 @@ function get_the_terms( $id = 0, $taxonomy ) {
 	}
 
 	$terms = get_object_term_cache( $id, $taxonomy );
-	if ( false === $terms )
+	if ( false === $terms ) {
 		$terms = wp_get_object_terms( $id, $taxonomy );
-
+		wp_cache_add($id, $terms, $taxonomy . '_relationships');
+	}
+	
 	$terms = apply_filters( 'get_the_terms', $terms, $id, $taxonomy );
 
 	if ( empty( $terms ) )