Add the value of BST_STRICT_REBUILD to the cache key. This prevents confusing situations like #1270.
This merge request, when approved, will close: #1270