uncomment caching
refactor changes to LVS helper