Fixed layout cache cleanup bugs
Made transition probing more robust