Added reading from cache of full lines for YATSM and some cleanup