diff --git a/docs/frontend_api/entities_note_short.js.html b/docs/frontend_api/entities_note_short.js.html
index 0e70fda84..56e5f0558 100644
--- a/docs/frontend_api/entities_note_short.js.html
+++ b/docs/frontend_api/entities_note_short.js.html
@@ -30,7 +30,7 @@
 import noteAttributeCache from "../services/note_attribute_cache.js";
 import ws from "../services/ws.js";
 import options from "../services/options.js";
-import froca from "../services/tree_cache.js";
+import froca from "../services/froca.js";
 
 const LABEL = 'label';
 const RELATION = 'relation';
diff --git a/docs/frontend_api/services_frontend_script_api.js.html b/docs/frontend_api/services_frontend_script_api.js.html
index c93b483b9..857da64d7 100644
--- a/docs/frontend_api/services_frontend_script_api.js.html
+++ b/docs/frontend_api/services_frontend_script_api.js.html
@@ -30,7 +30,7 @@
 import utils from './utils.js';
 import toastService from './toast.js';
 import linkService from './link.js';
-import froca from './tree_cache.js';
+import froca from './froca.js';
 import noteTooltipService from './note_tooltip.js';
 import protectedSessionService from './protected_session.js';
 import dateNotesService from './date_notes.js';
diff --git a/spec/search/note_cache_mocking.js b/spec/search/note_cache_mocking.js
index fbdbf1ae4..27afb5956 100644
--- a/spec/search/note_cache_mocking.js
+++ b/spec/search/note_cache_mocking.js
@@ -1,7 +1,7 @@
-const Note = require('../../src/services/note_cache/entities/note.js');
-const Branch = require('../../src/services/note_cache/entities/branch.js');
-const Attribute = require('../../src/services/note_cache/entities/attribute.js');
-const becca = require('../../src/services/note_cache/note_cache.js');
+const Note = require('../../src/services/becca/entities/note.js');
+const Branch = require('../../src/services/becca/entities/branch.js');
+const Attribute = require('../../src/services/becca/entities/attribute.js');
+const becca = require('../../src/services/becca/becca.js');
 const randtoken = require('rand-token').generator({source: 'crypto'});
 
 /** @return {Note} */
diff --git a/spec/search/search.spec.js b/spec/search/search.spec.js
index c8b35d9dc..26079e4a6 100644
--- a/spec/search/search.spec.js
+++ b/spec/search/search.spec.js
@@ -1,9 +1,9 @@
 const searchService = require('../../src/services/search/services/search.js');
-const Note = require('../../src/services/note_cache/entities/note.js');
-const Branch = require('../../src/services/note_cache/entities/branch.js');
+const Note = require('../../src/services/becca/entities/note.js');
+const Branch = require('../../src/services/becca/entities/branch.js');
 const SearchContext = require('../../src/services/search/search_context.js');
 const dateUtils = require('../../src/services/date_utils.js');
-const becca = require('../../src/services/note_cache/note_cache.js');
+const becca = require('../../src/services/becca/becca.js');
 const {NoteBuilder, findNoteByTitle, note} = require('./note_cache_mocking.js');
 
 describe("Search", () => {
diff --git a/spec/search/value_extractor.spec.js b/spec/search/value_extractor.spec.js
index 319496739..aa3096756 100644
--- a/spec/search/value_extractor.spec.js
+++ b/spec/search/value_extractor.spec.js
@@ -1,6 +1,6 @@
 const {note} = require('./note_cache_mocking.js');
 const ValueExtractor = require('../../src/services/search/value_extractor.js');
-const becca = require('../../src/services/note_cache/note_cache.js');
+const becca = require('../../src/services/becca/becca.js');
 const SearchContext = require("../../src/services/search/search_context.js");
 
 const dsc = new SearchContext();
diff --git a/src/app.js b/src/app.js
index a9024c8b2..195625df2 100644
--- a/src/app.js
+++ b/src/app.js
@@ -10,7 +10,7 @@ const FileStore = require('session-file-store')(session);
 const sessionSecret = require('./services/session_secret');
 const dataDir = require('./services/data_dir');
 require('./services/handlers');
-require('./services/note_cache/note_cache_loader');
+require('./services/becca/becca_loader.js');
 
 const app = express();
 
diff --git a/src/public/app/dialogs/branch_prefix.js b/src/public/app/dialogs/branch_prefix.js
index 6ce36ed3a..fcb31a821 100644
--- a/src/public/app/dialogs/branch_prefix.js
+++ b/src/public/app/dialogs/branch_prefix.js
@@ -1,6 +1,6 @@
 import treeService from '../services/tree.js';
 import server from '../services/server.js';
-import froca from "../services/tree_cache.js";
+import froca from "../services/froca.js";
 import toastService from "../services/toast.js";
 import utils from "../services/utils.js";
 
diff --git a/src/public/app/dialogs/clone_to.js b/src/public/app/dialogs/clone_to.js
index ee4c9a76f..081dcc458 100644
--- a/src/public/app/dialogs/clone_to.js
+++ b/src/public/app/dialogs/clone_to.js
@@ -2,7 +2,7 @@ import noteAutocompleteService from "../services/note_autocomplete.js";
 import utils from "../services/utils.js";
 import treeService from "../services/tree.js";
 import toastService from "../services/toast.js";
-import froca from "../services/tree_cache.js";
+import froca from "../services/froca.js";
 import branchService from "../services/branches.js";
 
 const $dialog = $("#clone-to-dialog");
diff --git a/src/public/app/dialogs/delete_notes.js b/src/public/app/dialogs/delete_notes.js
index e04390d12..a18816562 100644
--- a/src/public/app/dialogs/delete_notes.js
+++ b/src/public/app/dialogs/delete_notes.js
@@ -1,5 +1,5 @@
 import server from "../services/server.js";
-import froca from "../services/tree_cache.js";
+import froca from "../services/froca.js";
 import linkService from "../services/link.js";
 import utils from "../services/utils.js";
 
diff --git a/src/public/app/dialogs/export.js b/src/public/app/dialogs/export.js
index ba4f37984..f191443be 100644
--- a/src/public/app/dialogs/export.js
+++ b/src/public/app/dialogs/export.js
@@ -2,7 +2,7 @@ import treeService from "../services/tree.js";
 import utils from "../services/utils.js";
 import ws from "../services/ws.js";
 import toastService from "../services/toast.js";
-import froca from "../services/tree_cache.js";
+import froca from "../services/froca.js";
 import openService from "../services/open.js";
 
 const $dialog = $("#export-dialog");
diff --git a/src/public/app/dialogs/include_note.js b/src/public/app/dialogs/include_note.js
index 549c2285e..f3bebc967 100644
--- a/src/public/app/dialogs/include_note.js
+++ b/src/public/app/dialogs/include_note.js
@@ -1,7 +1,7 @@
 import treeService from '../services/tree.js';
 import noteAutocompleteService from '../services/note_autocomplete.js';
 import utils from "../services/utils.js";
-import froca from "../services/tree_cache.js";
+import froca from "../services/froca.js";
 
 const $dialog = $("#include-note-dialog");
 const $form = $("#include-note-form");
diff --git a/src/public/app/dialogs/move_to.js b/src/public/app/dialogs/move_to.js
index f8265e051..061dd57a8 100644
--- a/src/public/app/dialogs/move_to.js
+++ b/src/public/app/dialogs/move_to.js
@@ -1,7 +1,7 @@
 import noteAutocompleteService from "../services/note_autocomplete.js";
 import utils from "../services/utils.js";
 import toastService from "../services/toast.js";
-import froca from "../services/tree_cache.js";
+import froca from "../services/froca.js";
 import branchService from "../services/branches.js";
 import treeService from "../services/tree.js";
 
diff --git a/src/public/app/dialogs/recent_changes.js b/src/public/app/dialogs/recent_changes.js
index d9e4fa4b5..475535f92 100644
--- a/src/public/app/dialogs/recent_changes.js
+++ b/src/public/app/dialogs/recent_changes.js
@@ -2,7 +2,7 @@ import linkService from '../services/link.js';
 import utils from '../services/utils.js';
 import server from '../services/server.js';
 import treeService from "../services/tree.js";
-import froca from "../services/tree_cache.js";
+import froca from "../services/froca.js";
 import appContext from "../services/app_context.js";
 import hoistedNoteService from "../services/hoisted_note.js";
 
diff --git a/src/public/app/entities/note_short.js b/src/public/app/entities/note_short.js
index f0b4ee621..370b5eaa9 100644
--- a/src/public/app/entities/note_short.js
+++ b/src/public/app/entities/note_short.js
@@ -2,7 +2,7 @@ import server from '../services/server.js';
 import noteAttributeCache from "../services/note_attribute_cache.js";
 import ws from "../services/ws.js";
 import options from "../services/options.js";
-import froca from "../services/tree_cache.js";
+import froca from "../services/froca.js";
 
 const LABEL = 'label';
 const RELATION = 'relation';
diff --git a/src/public/app/services/app_context.js b/src/public/app/services/app_context.js
index 09ee073cf..f41046c34 100644
--- a/src/public/app/services/app_context.js
+++ b/src/public/app/services/app_context.js
@@ -1,4 +1,4 @@
-import froca from "./tree_cache.js";
+import froca from "./froca.js";
 import bundleService from "./bundle.js";
 import DialogCommandExecutor from "./dialog_command_executor.js";
 import Entrypoints from "./entrypoints.js";
diff --git a/src/public/app/services/attribute_renderer.js b/src/public/app/services/attribute_renderer.js
index 66a280967..09eb698ff 100644
--- a/src/public/app/services/attribute_renderer.js
+++ b/src/public/app/services/attribute_renderer.js
@@ -1,5 +1,5 @@
 import ws from "./ws.js";
-import froca from "./tree_cache.js";
+import froca from "./froca.js";
 
 async function renderAttribute(attribute, renderIsInheritable) {
     const isInheritable = renderIsInheritable && attribute.isInheritable ? `(inheritable)` : '';
diff --git a/src/public/app/services/branches.js b/src/public/app/services/branches.js
index 0239709e3..f5360fd79 100644
--- a/src/public/app/services/branches.js
+++ b/src/public/app/services/branches.js
@@ -1,7 +1,7 @@
 import utils from './utils.js';
 import server from './server.js';
 import toastService from "./toast.js";
-import froca from "./tree_cache.js";
+import froca from "./froca.js";
 import hoistedNoteService from "./hoisted_note.js";
 import ws from "./ws.js";
 
diff --git a/src/public/app/services/bundle.js b/src/public/app/services/bundle.js
index def06559f..57eecc922 100644
--- a/src/public/app/services/bundle.js
+++ b/src/public/app/services/bundle.js
@@ -1,7 +1,7 @@
 import ScriptContext from "./script_context.js";
 import server from "./server.js";
 import toastService from "./toast.js";
-import froca from "./tree_cache.js";
+import froca from "./froca.js";
 import utils from "./utils.js";
 
 async function getAndExecuteBundle(noteId, originEntity = null) {
diff --git a/src/public/app/services/clipboard.js b/src/public/app/services/clipboard.js
index 654b14a23..a03782e7b 100644
--- a/src/public/app/services/clipboard.js
+++ b/src/public/app/services/clipboard.js
@@ -1,7 +1,7 @@
 import branchService from "./branches.js";
 import toastService from "./toast.js";
 import hoistedNoteService from "./hoisted_note.js";
-import froca from "./tree_cache.js";
+import froca from "./froca.js";
 
 let clipboardBranchIds = [];
 let clipboardMode = null;
diff --git a/src/public/app/services/date_notes.js b/src/public/app/services/date_notes.js
index 77c1647c6..e9d228bb1 100644
--- a/src/public/app/services/date_notes.js
+++ b/src/public/app/services/date_notes.js
@@ -1,4 +1,4 @@
-import froca from "./tree_cache.js";
+import froca from "./froca.js";
 import server from "./server.js";
 import ws from "./ws.js";
 
diff --git a/src/public/app/services/tree_cache.js b/src/public/app/services/froca.js
similarity index 100%
rename from src/public/app/services/tree_cache.js
rename to src/public/app/services/froca.js
diff --git a/src/public/app/services/frontend_script_api.js b/src/public/app/services/frontend_script_api.js
index f8420b28d..20e1ef937 100644
--- a/src/public/app/services/frontend_script_api.js
+++ b/src/public/app/services/frontend_script_api.js
@@ -2,7 +2,7 @@ import server from './server.js';
 import utils from './utils.js';
 import toastService from './toast.js';
 import linkService from './link.js';
-import froca from './tree_cache.js';
+import froca from './froca.js';
 import noteTooltipService from './note_tooltip.js';
 import protectedSessionService from './protected_session.js';
 import dateNotesService from './date_notes.js';
diff --git a/src/public/app/services/glob.js b/src/public/app/services/glob.js
index dcb1158e6..2e444af3d 100644
--- a/src/public/app/services/glob.js
+++ b/src/public/app/services/glob.js
@@ -4,7 +4,7 @@ import server from "./server.js";
 import libraryLoader from "./library_loader.js";
 import ws from "./ws.js";
 import protectedSessionHolder from "./protected_session_holder.js";
-import froca from "./tree_cache.js";
+import froca from "./froca.js";
 
 function setupGlobs() {
     window.glob.PROFILING_LOG = false;
diff --git a/src/public/app/services/link.js b/src/public/app/services/link.js
index 318fb1620..36c2bb992 100644
--- a/src/public/app/services/link.js
+++ b/src/public/app/services/link.js
@@ -1,7 +1,7 @@
 import treeService from './tree.js';
 import contextMenu from "./context_menu.js";
 import appContext from "./app_context.js";
-import froca from "./tree_cache.js";
+import froca from "./froca.js";
 import utils from "./utils.js";
 
 function getNotePathFromUrl(url) {
diff --git a/src/public/app/services/link_map.js b/src/public/app/services/link_map.js
index 2d233f39a..0972a13e7 100644
--- a/src/public/app/services/link_map.js
+++ b/src/public/app/services/link_map.js
@@ -1,6 +1,6 @@
 import libraryLoader from "./library_loader.js";
 import server from "./server.js";
-import froca from "./tree_cache.js";
+import froca from "./froca.js";
 import linkService from "./link.js";
 
 const linkOverlays = [
diff --git a/src/public/app/services/note_autocomplete.js b/src/public/app/services/note_autocomplete.js
index be3b6ed9f..cdcda872b 100644
--- a/src/public/app/services/note_autocomplete.js
+++ b/src/public/app/services/note_autocomplete.js
@@ -3,7 +3,7 @@ import appContext from "./app_context.js";
 import utils from './utils.js';
 import noteCreateService from './note_create.js';
 import treeService from './tree.js';
-import froca from "./tree_cache.js";
+import froca from "./froca.js";
 
 // this key needs to have this value so it's hit by the tooltip
 const SELECTED_NOTE_PATH_KEY = "data-note-path";
diff --git a/src/public/app/services/note_content_renderer.js b/src/public/app/services/note_content_renderer.js
index 0b68113c0..533fc0497 100644
--- a/src/public/app/services/note_content_renderer.js
+++ b/src/public/app/services/note_content_renderer.js
@@ -4,7 +4,7 @@ import protectedSessionService from "./protected_session.js";
 import protectedSessionHolder from "./protected_session_holder.js";
 import libraryLoader from "./library_loader.js";
 import openService from "./open.js";
-import froca from "./tree_cache.js";
+import froca from "./froca.js";
 
 async function getRenderedContent(note, options = {}) {
     options = Object.assign({
diff --git a/src/public/app/services/note_create.js b/src/public/app/services/note_create.js
index edf850d92..7819c6ebd 100644
--- a/src/public/app/services/note_create.js
+++ b/src/public/app/services/note_create.js
@@ -3,7 +3,7 @@ import utils from "./utils.js";
 import protectedSessionHolder from "./protected_session_holder.js";
 import server from "./server.js";
 import ws from "./ws.js";
-import froca from "./tree_cache.js";
+import froca from "./froca.js";
 import treeService from "./tree.js";
 import toastService from "./toast.js";
 
diff --git a/src/public/app/services/note_list_renderer.js b/src/public/app/services/note_list_renderer.js
index abd9919e7..7cb44e735 100644
--- a/src/public/app/services/note_list_renderer.js
+++ b/src/public/app/services/note_list_renderer.js
@@ -1,6 +1,6 @@
 import linkService from "./link.js";
 import noteContentRenderer from "./note_content_renderer.js";
-import froca from "./tree_cache.js";
+import froca from "./froca.js";
 import attributeService from "./attributes.js";
 import attributeRenderer from "./attribute_renderer.js";
 
diff --git a/src/public/app/services/note_tooltip.js b/src/public/app/services/note_tooltip.js
index dd009e7fb..6cfa24572 100644
--- a/src/public/app/services/note_tooltip.js
+++ b/src/public/app/services/note_tooltip.js
@@ -1,6 +1,6 @@
 import treeService from "./tree.js";
 import linkService from "./link.js";
-import froca from "./tree_cache.js";
+import froca from "./froca.js";
 import utils from "./utils.js";
 import attributeRenderer from "./attribute_renderer.js";
 import noteContentRenderer from "./note_content_renderer.js";
diff --git a/src/public/app/services/protected_session.js b/src/public/app/services/protected_session.js
index d62511681..25e7211bc 100644
--- a/src/public/app/services/protected_session.js
+++ b/src/public/app/services/protected_session.js
@@ -4,7 +4,7 @@ import protectedSessionHolder from './protected_session_holder.js';
 import toastService from "./toast.js";
 import ws from "./ws.js";
 import appContext from "./app_context.js";
-import froca from "./tree_cache.js";
+import froca from "./froca.js";
 
 let protectedSessionDeferred = null;
 
diff --git a/src/public/app/services/script_context.js b/src/public/app/services/script_context.js
index 005224afc..712ff7ad3 100644
--- a/src/public/app/services/script_context.js
+++ b/src/public/app/services/script_context.js
@@ -1,6 +1,6 @@
 import FrontendScriptApi from './frontend_script_api.js';
 import utils from './utils.js';
-import froca from './tree_cache.js';
+import froca from './froca.js';
 
 async function ScriptContext(startNoteId, allNoteIds, originEntity = null, $container = null) {
     const modules = {};
diff --git a/src/public/app/services/search.js b/src/public/app/services/search.js
index 7910e271c..2a9849431 100644
--- a/src/public/app/services/search.js
+++ b/src/public/app/services/search.js
@@ -1,5 +1,5 @@
 import server from "./server.js";
-import froca from "./tree_cache.js";
+import froca from "./froca.js";
 
 async function searchForNoteIds(searchString) {
     return await server.get('search/' + encodeURIComponent(searchString));
diff --git a/src/public/app/services/tab_context.js b/src/public/app/services/tab_context.js
index ff7c440c2..26c0ecbd6 100644
--- a/src/public/app/services/tab_context.js
+++ b/src/public/app/services/tab_context.js
@@ -4,7 +4,7 @@ import utils from "./utils.js";
 import appContext from "./app_context.js";
 import treeService from "./tree.js";
 import Component from "../widgets/component.js";
-import froca from "./tree_cache.js";
+import froca from "./froca.js";
 import hoistedNoteService from "./hoisted_note.js";
 
 class TabContext extends Component {
diff --git a/src/public/app/services/tab_manager.js b/src/public/app/services/tab_manager.js
index 9ecbed53f..b4116416f 100644
--- a/src/public/app/services/tab_manager.js
+++ b/src/public/app/services/tab_manager.js
@@ -2,7 +2,7 @@ import Component from "../widgets/component.js";
 import SpacedUpdate from "./spaced_update.js";
 import server from "./server.js";
 import options from "./options.js";
-import froca from "./tree_cache.js";
+import froca from "./froca.js";
 import treeService from "./tree.js";
 import utils from "./utils.js";
 import TabContext from "./tab_context.js";
diff --git a/src/public/app/services/tree.js b/src/public/app/services/tree.js
index 1dbd2a4b4..e20363987 100644
--- a/src/public/app/services/tree.js
+++ b/src/public/app/services/tree.js
@@ -1,7 +1,7 @@
 import ws from './ws.js';
 import utils from './utils.js';
 import server from './server.js';
-import froca from './tree_cache.js';
+import froca from './froca.js';
 import hoistedNoteService from '../services/hoisted_note.js';
 import appContext from "./app_context.js";
 
diff --git a/src/public/app/services/tree_context_menu.js b/src/public/app/services/tree_context_menu.js
index 55e582ea4..1b9bb7d1e 100644
--- a/src/public/app/services/tree_context_menu.js
+++ b/src/public/app/services/tree_context_menu.js
@@ -1,5 +1,5 @@
 import treeService from './tree.js';
-import froca from "./tree_cache.js";
+import froca from "./froca.js";
 import clipboard from './clipboard.js';
 import noteCreateService from "./note_create.js";
 import contextMenu from "./context_menu.js";
diff --git a/src/public/app/services/ws.js b/src/public/app/services/ws.js
index 9637a4836..970d985b3 100644
--- a/src/public/app/services/ws.js
+++ b/src/public/app/services/ws.js
@@ -5,7 +5,7 @@ import LoadResults from "./load_results.js";
 import Branch from "../entities/branch.js";
 import Attribute from "../entities/attribute.js";
 import options from "./options.js";
-import froca from "./tree_cache.js";
+import froca from "./froca.js";
 import noteAttributeCache from "./note_attribute_cache.js";
 
 const messageHandlers = [];
diff --git a/src/public/app/widgets/attribute_widgets/attribute_detail.js b/src/public/app/widgets/attribute_widgets/attribute_detail.js
index a9ac419d6..b99e590aa 100644
--- a/src/public/app/widgets/attribute_widgets/attribute_detail.js
+++ b/src/public/app/widgets/attribute_widgets/attribute_detail.js
@@ -1,5 +1,5 @@
 import server from "../../services/server.js";
-import froca from "../../services/tree_cache.js";
+import froca from "../../services/froca.js";
 import treeService from "../../services/tree.js";
 import linkService from "../../services/link.js";
 import attributeAutocompleteService from "../../services/attribute_autocomplete.js";
diff --git a/src/public/app/widgets/attribute_widgets/attribute_editor.js b/src/public/app/widgets/attribute_widgets/attribute_editor.js
index 233ec88f5..b3c52d63a 100644
--- a/src/public/app/widgets/attribute_widgets/attribute_editor.js
+++ b/src/public/app/widgets/attribute_widgets/attribute_editor.js
@@ -4,7 +4,7 @@ import server from "../../services/server.js";
 import contextMenuService from "../../services/context_menu.js";
 import attributesParser from "../../services/attribute_parser.js";
 import libraryLoader from "../../services/library_loader.js";
-import froca from "../../services/tree_cache.js";
+import froca from "../../services/froca.js";
 import attributeRenderer from "../../services/attribute_renderer.js";
 import noteCreateService from "../../services/note_create.js";
 import treeService from "../../services/tree.js";
diff --git a/src/public/app/widgets/collapsible_widgets/edited_notes.js b/src/public/app/widgets/collapsible_widgets/edited_notes.js
index f2d5588db..7a0a3d518 100644
--- a/src/public/app/widgets/collapsible_widgets/edited_notes.js
+++ b/src/public/app/widgets/collapsible_widgets/edited_notes.js
@@ -1,7 +1,7 @@
 import CollapsibleWidget from "../collapsible_widget.js";
 import linkService from "../../services/link.js";
 import server from "../../services/server.js";
-import froca from "../../services/tree_cache.js";
+import froca from "../../services/froca.js";
 
 const TPL = `
 <div class="edited-notes-widget">
diff --git a/src/public/app/widgets/collapsible_widgets/link_map.js b/src/public/app/widgets/collapsible_widgets/link_map.js
index c7c681382..d14929b3a 100644
--- a/src/public/app/widgets/collapsible_widgets/link_map.js
+++ b/src/public/app/widgets/collapsible_widgets/link_map.js
@@ -1,5 +1,5 @@
 import CollapsibleWidget from "../collapsible_widget.js";
-import froca from "../../services/tree_cache.js";
+import froca from "../../services/froca.js";
 
 let linkMapContainerIdCtr = 1;
 
diff --git a/src/public/app/widgets/note_tree.js b/src/public/app/widgets/note_tree.js
index 402d0da3e..2f4953ea7 100644
--- a/src/public/app/widgets/note_tree.js
+++ b/src/public/app/widgets/note_tree.js
@@ -2,7 +2,7 @@ import hoistedNoteService from "../services/hoisted_note.js";
 import treeService from "../services/tree.js";
 import utils from "../services/utils.js";
 import contextMenu from "../services/context_menu.js";
-import froca from "../services/tree_cache.js";
+import froca from "../services/froca.js";
 import branchService from "../services/branches.js";
 import ws from "../services/ws.js";
 import TabAwareWidget from "./tab_aware_widget.js";
diff --git a/src/public/app/widgets/quick_search.js b/src/public/app/widgets/quick_search.js
index aef337bde..665d70671 100644
--- a/src/public/app/widgets/quick_search.js
+++ b/src/public/app/widgets/quick_search.js
@@ -2,7 +2,7 @@ import BasicWidget from "./basic_widget.js";
 import server from "../services/server.js";
 import linkService from "../services/link.js";
 import dateNotesService from "../services/date_notes.js";
-import froca from "../services/tree_cache.js";
+import froca from "../services/froca.js";
 import utils from "../services/utils.js";
 import appContext from "../services/app_context.js";
 
diff --git a/src/public/app/widgets/similar_notes.js b/src/public/app/widgets/similar_notes.js
index 0e056d947..95356ef4a 100644
--- a/src/public/app/widgets/similar_notes.js
+++ b/src/public/app/widgets/similar_notes.js
@@ -1,6 +1,6 @@
 import linkService from "../services/link.js";
 import server from "../services/server.js";
-import froca from "../services/tree_cache.js";
+import froca from "../services/froca.js";
 import TabAwareWidget from "./tab_aware_widget.js";
 import options from "../services/options.js";
 
diff --git a/src/public/app/widgets/tab_row.js b/src/public/app/widgets/tab_row.js
index b4dbabd30..ecb2bbdda 100644
--- a/src/public/app/widgets/tab_row.js
+++ b/src/public/app/widgets/tab_row.js
@@ -3,7 +3,7 @@ import contextMenu from "../services/context_menu.js";
 import utils from "../services/utils.js";
 import keyboardActionService from "../services/keyboard_actions.js";
 import appContext from "../services/app_context.js";
-import froca from "../services/tree_cache.js";
+import froca from "../services/froca.js";
 
 /*!
  * Draggabilly v2.3.0
diff --git a/src/public/app/widgets/type_property_widgets/search_definition.js b/src/public/app/widgets/type_property_widgets/search_definition.js
index 96f8c1182..8f5036814 100644
--- a/src/public/app/widgets/type_property_widgets/search_definition.js
+++ b/src/public/app/widgets/type_property_widgets/search_definition.js
@@ -1,6 +1,6 @@
 import server from "../../services/server.js";
 import TabAwareWidget from "../tab_aware_widget.js";
-import froca from "../../services/tree_cache.js";
+import froca from "../../services/froca.js";
 import ws from "../../services/ws.js";
 import toastService from "../../services/toast.js";
 
diff --git a/src/public/app/widgets/type_widgets/abstract_text_type_widget.js b/src/public/app/widgets/type_widgets/abstract_text_type_widget.js
index 66c8482d7..5ebbc5dd3 100644
--- a/src/public/app/widgets/type_widgets/abstract_text_type_widget.js
+++ b/src/public/app/widgets/type_widgets/abstract_text_type_widget.js
@@ -1,6 +1,6 @@
 import TypeWidget from "./type_widget.js";
 import appContext from "../../services/app_context.js";
-import froca from "../../services/tree_cache.js";
+import froca from "../../services/froca.js";
 import linkService from "../../services/link.js";
 import noteContentRenderer from "../../services/note_content_renderer.js";
 
diff --git a/src/public/app/widgets/type_widgets/editable_text.js b/src/public/app/widgets/type_widgets/editable_text.js
index 53a762597..f60bea55a 100644
--- a/src/public/app/widgets/type_widgets/editable_text.js
+++ b/src/public/app/widgets/type_widgets/editable_text.js
@@ -3,7 +3,7 @@ import noteAutocompleteService from '../../services/note_autocomplete.js';
 import mimeTypesService from '../../services/mime_types.js';
 import utils from "../../services/utils.js";
 import keyboardActionService from "../../services/keyboard_actions.js";
-import froca from "../../services/tree_cache.js";
+import froca from "../../services/froca.js";
 import treeService from "../../services/tree.js";
 import noteCreateService from "../../services/note_create.js";
 import AbstractTextTypeWidget from "./abstract_text_type_widget.js";
diff --git a/src/public/app/widgets/type_widgets/read_only_text.js b/src/public/app/widgets/type_widgets/read_only_text.js
index 7eb4f1a49..418026402 100644
--- a/src/public/app/widgets/type_widgets/read_only_text.js
+++ b/src/public/app/widgets/type_widgets/read_only_text.js
@@ -1,4 +1,4 @@
-import froca from "../../services/tree_cache.js";
+import froca from "../../services/froca.js";
 import AbstractTextTypeWidget from "./abstract_text_type_widget.js";
 import treeService from "../../services/tree.js";
 import libraryLoader from "../../services/library_loader.js";
diff --git a/src/public/app/widgets/type_widgets/relation_map.js b/src/public/app/widgets/type_widgets/relation_map.js
index 1e6afa59a..ef709118c 100644
--- a/src/public/app/widgets/type_widgets/relation_map.js
+++ b/src/public/app/widgets/type_widgets/relation_map.js
@@ -7,7 +7,7 @@ import attributeAutocompleteService from "../../services/attribute_autocomplete.
 import TypeWidget from "./type_widget.js";
 import appContext from "../../services/app_context.js";
 import utils from "../../services/utils.js";
-import froca from "../../services/tree_cache.js";
+import froca from "../../services/froca.js";
 
 const uniDirectionalOverlays = [
     [ "Arrow", {
diff --git a/src/routes/api/autocomplete.js b/src/routes/api/autocomplete.js
index ad4dde969..ae76b6945 100644
--- a/src/routes/api/autocomplete.js
+++ b/src/routes/api/autocomplete.js
@@ -1,6 +1,6 @@
 "use strict";
 
-const beccaService = require('../../services/note_cache/note_cache_service');
+const beccaService = require('../../services/becca/becca_service.js');
 const searchService = require('../../services/search/services/search.js');
 const repository = require('../../services/repository');
 const log = require('../../services/log');
diff --git a/src/routes/api/branches.js b/src/routes/api/branches.js
index f6a2ff534..b83be175d 100644
--- a/src/routes/api/branches.js
+++ b/src/routes/api/branches.js
@@ -5,7 +5,7 @@ const utils = require('../../services/utils');
 const entityChangesService = require('../../services/entity_changes.js');
 const treeService = require('../../services/tree');
 const noteService = require('../../services/notes');
-const becca = require('../../services/note_cache/note_cache');
+const becca = require('../../services/becca/becca.js');
 const repository = require('../../services/repository');
 const TaskContext = require('../../services/task_context');
 
diff --git a/src/routes/api/import.js b/src/routes/api/import.js
index c593a80ee..b02054b5c 100644
--- a/src/routes/api/import.js
+++ b/src/routes/api/import.js
@@ -7,7 +7,7 @@ const zipImportService = require('../../services/import/zip');
 const singleImportService = require('../../services/import/single');
 const cls = require('../../services/cls');
 const path = require('path');
-const beccaLoader = require('../../services/note_cache/note_cache_loader.js');
+const beccaLoader = require('../../services/becca/becca_loader.js');
 const log = require('../../services/log');
 const TaskContext = require('../../services/task_context.js');
 
diff --git a/src/routes/api/note_revisions.js b/src/routes/api/note_revisions.js
index 39a861451..88fd5d590 100644
--- a/src/routes/api/note_revisions.js
+++ b/src/routes/api/note_revisions.js
@@ -1,7 +1,7 @@
 "use strict";
 
 const repository = require('../../services/repository');
-const beccaService = require('../../services/note_cache/note_cache_service');
+const beccaService = require('../../services/becca/becca_service.js');
 const protectedSessionService = require('../../services/protected_session');
 const noteRevisionService = require('../../services/note_revisions');
 const utils = require('../../services/utils');
diff --git a/src/routes/api/recent_changes.js b/src/routes/api/recent_changes.js
index e264a66da..5d7fe8044 100644
--- a/src/routes/api/recent_changes.js
+++ b/src/routes/api/recent_changes.js
@@ -3,7 +3,7 @@
 const sql = require('../../services/sql');
 const protectedSessionService = require('../../services/protected_session');
 const noteService = require('../../services/notes');
-const beccaService = require('../../services/note_cache/note_cache_service');
+const beccaService = require('../../services/becca/becca_service.js');
 
 function getRecentChanges(req) {
     const {ancestorNoteId} = req.params;
diff --git a/src/routes/api/similar_notes.js b/src/routes/api/similar_notes.js
index aa76a7f10..79417004f 100644
--- a/src/routes/api/similar_notes.js
+++ b/src/routes/api/similar_notes.js
@@ -1,6 +1,6 @@
 "use strict";
 
-const similarityService = require('../../services/note_cache/similarity.js');
+const similarityService = require('../../services/becca/similarity.js');
 const repository = require('../../services/repository');
 
 async function getSimilarNotes(req) {
diff --git a/src/routes/api/stats.js b/src/routes/api/stats.js
index 3811004a2..c96e6da43 100644
--- a/src/routes/api/stats.js
+++ b/src/routes/api/stats.js
@@ -1,5 +1,5 @@
 const sql = require('../../services/sql');
-const becca = require('../../services/note_cache/note_cache');
+const becca = require('../../services/becca/becca.js');
 
 function getNoteSize(req) {
     const {noteId} = req.params;
diff --git a/src/routes/api/tree.js b/src/routes/api/tree.js
index 702aee3e5..371faae18 100644
--- a/src/routes/api/tree.js
+++ b/src/routes/api/tree.js
@@ -1,6 +1,6 @@
 "use strict";
 
-const becca = require('../../services/note_cache/note_cache');
+const becca = require('../../services/becca/becca.js');
 const log = require('../../services/log');
 
 function getNotesAndBranchesAndAttributes(noteIds) {
diff --git a/src/services/attributes.js b/src/services/attributes.js
index 1f41bb348..7faa0ab52 100644
--- a/src/services/attributes.js
+++ b/src/services/attributes.js
@@ -2,7 +2,7 @@
 
 const repository = require('./repository');
 const sql = require('./sql');
-const becca = require('./note_cache/note_cache');
+const becca = require('./becca/becca.js');
 const Attribute = require('../entities/attribute');
 
 const ATTRIBUTE_TYPES = [ 'label', 'relation' ];
diff --git a/src/services/note_cache/note_cache.js b/src/services/becca/becca.js
similarity index 100%
rename from src/services/note_cache/note_cache.js
rename to src/services/becca/becca.js
diff --git a/src/services/note_cache/note_cache_loader.js b/src/services/becca/becca_loader.js
similarity index 99%
rename from src/services/note_cache/note_cache_loader.js
rename to src/services/becca/becca_loader.js
index 0d25b8037..05076e699 100644
--- a/src/services/note_cache/note_cache_loader.js
+++ b/src/services/becca/becca_loader.js
@@ -2,7 +2,7 @@
 
 const sql = require('../sql.js');
 const eventService = require('../events.js');
-const becca = require('./note_cache');
+const becca = require('./becca.js');
 const sqlInit = require('../sql_init');
 const log = require('../log');
 const Note = require('./entities/note');
diff --git a/src/services/note_cache/note_cache_service.js b/src/services/becca/becca_service.js
similarity index 99%
rename from src/services/note_cache/note_cache_service.js
rename to src/services/becca/becca_service.js
index 0f6a26c9e..2a36fb672 100644
--- a/src/services/note_cache/note_cache_service.js
+++ b/src/services/becca/becca_service.js
@@ -1,6 +1,6 @@
 "use strict";
 
-const becca = require('./note_cache');
+const becca = require('./becca.js');
 const cls = require('../cls');
 const protectedSessionService = require('../protected_session');
 const log = require('../log');
diff --git a/src/services/note_cache/entities/attribute.js b/src/services/becca/entities/attribute.js
similarity index 100%
rename from src/services/note_cache/entities/attribute.js
rename to src/services/becca/entities/attribute.js
diff --git a/src/services/note_cache/entities/branch.js b/src/services/becca/entities/branch.js
similarity index 100%
rename from src/services/note_cache/entities/branch.js
rename to src/services/becca/entities/branch.js
diff --git a/src/services/note_cache/entities/note.js b/src/services/becca/entities/note.js
similarity index 100%
rename from src/services/note_cache/entities/note.js
rename to src/services/becca/entities/note.js
diff --git a/src/services/note_cache/similarity.js b/src/services/becca/similarity.js
similarity index 99%
rename from src/services/note_cache/similarity.js
rename to src/services/becca/similarity.js
index 0845ef872..a3d1bb2bb 100644
--- a/src/services/note_cache/similarity.js
+++ b/src/services/becca/similarity.js
@@ -1,6 +1,6 @@
-const becca = require('./note_cache');
+const becca = require('./becca.js');
 const log = require('../log');
-const beccaService = require('./note_cache_service.js');
+const beccaService = require('./becca_service.js');
 const dateUtils = require('../date_utils');
 const repository = require('../repository');
 const { JSDOM } = require("jsdom");
diff --git a/src/services/handlers.js b/src/services/handlers.js
index ef9c693c6..073b65d72 100644
--- a/src/services/handlers.js
+++ b/src/services/handlers.js
@@ -3,7 +3,7 @@ const scriptService = require('./script');
 const treeService = require('./tree');
 const noteService = require('./notes');
 const repository = require('./repository');
-const becca = require('./note_cache/note_cache');
+const becca = require('./becca/becca.js');
 const Attribute = require('../entities/attribute');
 
 function runAttachedRelations(note, relationName, originEntity) {
diff --git a/src/services/search/expressions/ancestor.js b/src/services/search/expressions/ancestor.js
index 298072ee1..7ce085427 100644
--- a/src/services/search/expressions/ancestor.js
+++ b/src/services/search/expressions/ancestor.js
@@ -3,7 +3,7 @@
 const Expression = require('./expression');
 const NoteSet = require('../note_set');
 const log = require('../../log');
-const becca = require('../../note_cache/note_cache');
+const becca = require('../../becca/becca.js');
 
 class AncestorExp extends Expression {
     constructor(ancestorNoteId, ancestorDepth) {
diff --git a/src/services/search/expressions/attribute_exists.js b/src/services/search/expressions/attribute_exists.js
index 53b1b3b81..4067f4655 100644
--- a/src/services/search/expressions/attribute_exists.js
+++ b/src/services/search/expressions/attribute_exists.js
@@ -1,7 +1,7 @@
 "use strict";
 
 const NoteSet = require('../note_set');
-const becca = require('../../note_cache/note_cache');
+const becca = require('../../becca/becca.js');
 const Expression = require('./expression');
 
 class AttributeExistsExp extends Expression {
diff --git a/src/services/search/expressions/descendant_of.js b/src/services/search/expressions/descendant_of.js
index 4b27536ec..b50302a73 100644
--- a/src/services/search/expressions/descendant_of.js
+++ b/src/services/search/expressions/descendant_of.js
@@ -2,7 +2,7 @@
 
 const Expression = require('./expression');
 const NoteSet = require('../note_set');
-const becca = require('../../note_cache/note_cache');
+const becca = require('../../becca/becca.js');
 
 class DescendantOfExp extends Expression {
     constructor(subExpression) {
diff --git a/src/services/search/expressions/label_comparison.js b/src/services/search/expressions/label_comparison.js
index a011c8b3c..59506da2b 100644
--- a/src/services/search/expressions/label_comparison.js
+++ b/src/services/search/expressions/label_comparison.js
@@ -2,7 +2,7 @@
 
 const Expression = require('./expression');
 const NoteSet = require('../note_set');
-const becca = require('../../note_cache/note_cache');
+const becca = require('../../becca/becca.js');
 
 class LabelComparisonExp extends Expression {
     constructor(attributeType, attributeName, comparator) {
diff --git a/src/services/search/expressions/note_cache_flat_text.js b/src/services/search/expressions/note_cache_flat_text.js
index c952bb8a5..54d3892c9 100644
--- a/src/services/search/expressions/note_cache_flat_text.js
+++ b/src/services/search/expressions/note_cache_flat_text.js
@@ -2,7 +2,7 @@
 
 const Expression = require('./expression');
 const NoteSet = require('../note_set');
-const becca = require('../../note_cache/note_cache');
+const becca = require('../../becca/becca.js');
 
 class BeccaFlatTextExp extends Expression {
     constructor(tokens) {
@@ -13,7 +13,7 @@ class BeccaFlatTextExp extends Expression {
 
     execute(inputNoteSet, executionContext) {
         // has deps on SQL which breaks unit test so needs to be dynamically required
-        const beccaService = require('../../note_cache/note_cache_service');
+        const beccaService = require('../../becca/becca_service.js');
         const resultNoteSet = new NoteSet();
 
         function searchDownThePath(note, tokens, path) {
diff --git a/src/services/search/expressions/note_content_protected_fulltext.js b/src/services/search/expressions/note_content_protected_fulltext.js
index c977ee53d..b1224f634 100644
--- a/src/services/search/expressions/note_content_protected_fulltext.js
+++ b/src/services/search/expressions/note_content_protected_fulltext.js
@@ -3,7 +3,7 @@
 const Expression = require('./expression');
 const NoteSet = require('../note_set');
 const log = require('../../log');
-const becca = require('../../note_cache/note_cache');
+const becca = require('../../becca/becca.js');
 const protectedSessionService = require('../../protected_session');
 const striptags = require('striptags');
 
diff --git a/src/services/search/expressions/note_content_unprotected_fulltext.js b/src/services/search/expressions/note_content_unprotected_fulltext.js
index b621f7e4f..230df2f1d 100644
--- a/src/services/search/expressions/note_content_unprotected_fulltext.js
+++ b/src/services/search/expressions/note_content_unprotected_fulltext.js
@@ -2,7 +2,7 @@
 
 const Expression = require('./expression');
 const NoteSet = require('../note_set');
-const becca = require('../../note_cache/note_cache');
+const becca = require('../../becca/becca.js');
 const striptags = require('striptags');
 
 class NoteContentUnprotectedFulltextExp extends Expression {
diff --git a/src/services/search/expressions/relation_where.js b/src/services/search/expressions/relation_where.js
index 608c25b44..2086e0601 100644
--- a/src/services/search/expressions/relation_where.js
+++ b/src/services/search/expressions/relation_where.js
@@ -2,7 +2,7 @@
 
 const Expression = require('./expression');
 const NoteSet = require('../note_set');
-const becca = require('../../note_cache/note_cache');
+const becca = require('../../becca/becca.js');
 
 class RelationWhereExp extends Expression {
     constructor(relationName, subExpression) {
diff --git a/src/services/search/search_result.js b/src/services/search/search_result.js
index bab4597dc..c7045a789 100644
--- a/src/services/search/search_result.js
+++ b/src/services/search/search_result.js
@@ -1,6 +1,6 @@
 "use strict";
 
-const beccaService = require('../note_cache/note_cache_service');
+const beccaService = require('../becca/becca_service.js');
 
 class SearchResult {
     constructor(notePathArray) {
diff --git a/src/services/search/services/search.js b/src/services/search/services/search.js
index b3312b755..85fdf8cb2 100644
--- a/src/services/search/services/search.js
+++ b/src/services/search/services/search.js
@@ -6,8 +6,8 @@ const parse = require('./parse.js');
 const NoteSet = require("../note_set.js");
 const SearchResult = require("../search_result.js");
 const SearchContext = require("../search_context.js");
-const becca = require('../../note_cache/note_cache.js');
-const beccaService = require('../../note_cache/note_cache_service.js');
+const becca = require('../../becca/becca.js');
+const beccaService = require('../../becca/becca_service.js');
 const utils = require('../../utils.js');
 const log = require('../../log.js');
 
diff --git a/src/services/sql.js b/src/services/sql.js
index ea05ddb77..d29192afe 100644
--- a/src/services/sql.js
+++ b/src/services/sql.js
@@ -249,7 +249,7 @@ function transactional(func) {
         if (entityChanges.length > 0) {
             log.info("Transaction rollback dirtied the becca, forcing reload.");
 
-            require('./note_cache/note_cache_loader').load();
+            require('./becca/becca_loader.js').load();
         }
 
         throw e;
diff --git a/src/services/tree.js b/src/services/tree.js
index 098f9e054..723e3887d 100644
--- a/src/services/tree.js
+++ b/src/services/tree.js
@@ -6,7 +6,7 @@ const repository = require('./repository');
 const Branch = require('../entities/branch');
 const entityChangesService = require('./entity_changes.js');
 const protectedSessionService = require('./protected_session');
-const becca = require('./note_cache/note_cache');
+const becca = require('./becca/becca.js');
 
 function getNotes(noteIds) {
     // we return also deleted notes which have been specifically asked for