am 81ae71ce: am 2e607aeb: Use attachment cache on layout passes

* commit '81ae71ce6b342b6df137de361fe7a1139e64ce98':
  Use attachment cache on layout passes