Add no-op fetcher
Add locking implementation
Fix locking implementation