Fix constant removal in features
Use soft refs in cache