Core PR # 107 : Bugfix: set local in rebuild cache