Added caching on edit, weights to views