Some additional cleanup, clarified diskcache comments somewhat