Updated uncached view matching logic