changed locator cache to static