Fixed leftovers in bug and mutable classes caching