Removed force compile, added cache support