Merge "Fix type hint for properties holding MapCacheLRU"